]> source.dussan.org Git - nextcloud-server.git/commit
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)
commite5a3ab8aad0b0deb312a97acb3fc808b497b0544
tree5f7074a651b979cd0c9659de3f8d3fb6066fa37b
parent03d9fab3c0cf3a3c50259d6a33439a998628b45c
parentef124c3e21ceae49f0f704589a833d1208d99c65
Merge branch 'master' into fullcalendar
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php