]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 13 Apr 2012 20:42:10 +0000 (16:42 -0400)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 13 Apr 2012 20:42:10 +0000 (16:42 -0400)
1  2 
apps/calendar/ajax/event/edit.form.php
apps/calendar/lib/object.php

Simple merge