]> source.dussan.org Git - nextcloud-server.git/commit
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)
commitef1b04619daa7b72ca1a8427702bd3552b848e6c
treedb3f22c8bd0e5cfb3fec2cda403fcaa20fe38214
parentc83f418a024190fc7683b45a1009f01f2d039a17
parentc11f6cc3f9121fbb337c248807b802c72b18087b
fix merge conflicts
apps/calendar/lib/object.php