]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into calendar_repeat
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 20 Jun 2012 18:14:08 +0000 (20:14 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 20 Jun 2012 18:14:08 +0000 (20:14 +0200)
commit0f13cbb47daf46a2a2d121364529fd6082a74cc1
tree1d108d87250f83bdf6e7258b4ce00cb8afecaea9
parent572dd9fbade253c68f664e4706c57665b5322f43
parentf255ac8b3a82bcf9e77c3bc0db7583d1492df44c
Merge branch 'master' into calendar_repeat
apps/calendar/ajax/events.php
apps/calendar/lib/object.php