]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 21 Apr 2012 21:21:50 +0000 (23:21 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 21 Apr 2012 21:21:50 +0000 (23:21 +0200)
commit0918fc7d9156f3846a19b673db5b01422a59c506
tree131188252fd42c4f3c9673975adafa24783c632f
parent77cefdedb86de65e69f470c8b6a1b03bb001966e
parent74e540271122222f650bbbfaeaac310b0e592674
fix merge conflicts
apps/calendar/ajax/event/edit.form.php
apps/calendar/ajax/event/move.php
apps/calendar/ajax/event/resize.php
apps/calendar/ajax/events.php
apps/calendar/lib/object.php