]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'calendar_dropimport'
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 19 May 2012 16:58:24 +0000 (18:58 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 19 May 2012 16:58:24 +0000 (18:58 +0200)

Trivial merge