]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 16 Jun 2012 07:48:07 +0000 (09:48 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 16 Jun 2012 07:48:07 +0000 (09:48 +0200)
commitfc632b57959574c321cf58807f4697a0488c2106
tree5b1c9430c9daede4f3b8d3d4a642db4a508d45f9
parentcbe5449f47fe483253c1308c7cac41c3cdf5d848
fix merge conflicts
23 files changed:
apps/calendar/ajax/calendar/activation.php
apps/calendar/ajax/calendar/delete.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/calendar/edit.php
apps/calendar/ajax/calendar/new.form.php
apps/calendar/ajax/calendar/new.php
apps/calendar/ajax/calendar/overview.php
apps/calendar/ajax/calendar/update.php
apps/calendar/ajax/categories/rescan.php
apps/calendar/ajax/event/delete.php
apps/calendar/ajax/event/edit.php
apps/calendar/ajax/event/move.php
apps/calendar/ajax/event/new.form.php
apps/calendar/ajax/event/new.php
apps/calendar/ajax/event/resize.php
apps/calendar/ajax/import/dialog.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/getfirstday.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/settings/settimezone.php
apps/calendar/ajax/settings/timeformat.php