]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_repeat
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 1 Jun 2012 09:40:39 +0000 (11:40 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 1 Jun 2012 09:40:39 +0000 (11:40 +0200)
1  2 
apps/calendar/appinfo/app.php

Simple merge