]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 15 Jun 2012 09:48:26 +0000 (11:48 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 15 Jun 2012 09:48:26 +0000 (11:48 +0200)
commit4767c705782786f1682ebef1c4d726ac3a4fb5f5
tree962a5f91a64b134c281f72975e1a1035b0cecc6a
parent22a33b509ff8339393834764a19d8d026177783e
parent2b228fba3463722ad19ea6ccd150b96772508791
fix merge conflicts
apps/calendar/ajax/events.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php