]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into calendar_import
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 21 Jul 2012 15:37:10 +0000 (17:37 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 21 Jul 2012 15:37:10 +0000 (17:37 +0200)
commitf9d33888544ac8abdaf287cc8d558d057de01720
treedafc4ebff833be164ea6db5e06f992ec4f5f0e67
parentd49b789348315be677e66593eaca43e0e399d3da
parent57207ddb82875f7e3e36b0dfb2811ab161a0f08c
Merge branch 'master' into calendar_import
apps/calendar/ajax/import/import.php
apps/calendar/appinfo/app.php