Commit 5e397d89 authored 11 years ago by Thomas Müller

Merge branch 'master' into fixing-4546-master

Conflicts:
	lib/private/connector/sabre/directory.php

Branches

No related tags found

Showing with 199 additions and 136 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment