]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 25 Mar 2012 12:02:02 +0000 (14:02 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 25 Mar 2012 12:02:02 +0000 (14:02 +0200)
commit19c101a660e311437bd471f0c87f0a9413351f7f
tree09be642404b56a14e2f7e4e09e426ea9e88c9a68
parent37963fee28824165d50e8a12c754fb9ee26d89d8
parent34c08b3165ff7ee024006b4c425130fde057863c
fix merge conflicts
apps/calendar/ajax/events.php
apps/calendar/lib/app.php