]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 20:28:11 +0000 (22:28 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 20:28:11 +0000 (22:28 +0200)
1  2 
apps/calendar/ajax/events.php
apps/calendar/lib/search.php

Simple merge
Simple merge