]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 20:28:11 +0000 (22:28 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 20:28:11 +0000 (22:28 +0200)
commit77cefdedb86de65e69f470c8b6a1b03bb001966e
tree547b3a111c4d07992b7c528f2db4962ee36f91f9
parent77a9e343aae4fc19a1e6fbf71b73e171640ac02a
parent12818093007d5bdce5519b5015e2a0748c98e24d
Merge branch 'master' into sabredav_1.6
apps/calendar/ajax/events.php
apps/calendar/lib/search.php