]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 13 Apr 2012 20:40:10 +0000 (16:40 -0400)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 13 Apr 2012 20:40:10 +0000 (16:40 -0400)
commitafcb0aee40230c68dd99f5ea2501b7ba7e444560
tree5ccd10e78128c70e71a36ca9080a652a7bd833d5
parent02dc34320978bfbcb30dea34b87808837586bb65
parentb9f9228a22944184803a8835282862e468812c1d
fix merge conflicts
apps/calendar/ajax/event/edit.form.php
apps/calendar/ajax/event/new.form.php
apps/calendar/index.php
apps/calendar/js/calendar.js
apps/calendar/lib/app.php
apps/calendar/lib/object.php
apps/calendar/templates/part.eventform.php
core/css/styles.css