]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 10:43:07 +0000 (12:43 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 10:43:07 +0000 (12:43 +0200)
commite292b1fcdbe15d3a048c89f1825cb9ae8831edbb
treea310b840389eff1f324b68c3ed3a002b0bb963e7
parente256ac8791eedcb3dcab1ade0927f1831e24d2e2
parenta6a8e2c553bd2ba82c3d50f147a49793ed62b6f5
fix merge conflicts
apps/calendar/ajax/event/delete.php
apps/calendar/ajax/events.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/version
apps/calendar/lib/app.php
core/css/styles.css