]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_repeat
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 20 Jun 2012 18:14:08 +0000 (20:14 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 20 Jun 2012 18:14:08 +0000 (20:14 +0200)
1  2 
apps/calendar/ajax/events.php
apps/calendar/lib/object.php

Simple merge
Simple merge