]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Mon, 19 Mar 2012 07:33:36 +0000 (08:33 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Mon, 19 Mar 2012 07:33:36 +0000 (08:33 +0100)
commit33b06c448443bb0085ff986c341594d80903f43b
treee80977f084f5f149471995976edb4a01eee886a9
parent097ce76fc4383c68856ee70db0c87f0e9f5fefb4
parentde09883d860d6507a2d287d0b8bae394963c4b94
Merge branch 'master' into sabredav_1.6
apps/calendar/ajax/events.php
apps/calendar/lib/object.php
apps/calendar/lib/search.php
lib/connector/sabre/directory.php
lib/connector/sabre/principal.php