Skip to content
Commit a2301e8b authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fixing-4546-master 

Conflicts:
	lib/connector/sabre/directory.php
parents fe352664 ebb2278a
Hide whitespace changes
Inline Side-by-side
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