]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 13 Apr 2012 20:42:10 +0000 (16:42 -0400)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 13 Apr 2012 20:42:10 +0000 (16:42 -0400)
commit77a9e343aae4fc19a1e6fbf71b73e171640ac02a
tree3d110503a333595b1d7c233ae903dcc79e5f664e
parent613e15035e3f02a212c9f3ec11ae98fc3ef682c8
parentb9f9228a22944184803a8835282862e468812c1d
Merge branch 'master' into sabredav_1.6
apps/calendar/ajax/event/edit.form.php
apps/calendar/lib/object.php