]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fullcalendar
authorGeorg Ehrke <ownclouddev@georgswebsite.de>
Sat, 12 Nov 2011 14:09:37 +0000 (15:09 +0100)
committerGeorg Ehrke <ownclouddev@georgswebsite.de>
Sat, 12 Nov 2011 14:09:37 +0000 (15:09 +0100)
1  2 
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php

Simple merge
Simple merge