Skip to content
Snippets Groups Projects
Commit a7a54331 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'master' into chunked_upload

Conflicts:
	lib/connector/sabre/directory.php
parents e8010209 d26f87e7
No related branches found
No related tags found
Loading
Showing
with 64 additions and 3 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment