]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 10 Jun 2012 16:38:01 +0000 (18:38 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 10 Jun 2012 16:38:01 +0000 (18:38 +0200)
1  2 
apps/calendar/lib/object.php

Simple merge