Skip to content
Snippets Groups Projects
Commit bb6fac11 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into contactsmanager-register 

Conflicts:
	lib/private/contactsmanager.php
parents 7c037010 b6d2d632
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2900 additions and 2148 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment