]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'sabredav_1.6'
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 25 Apr 2012 08:39:31 +0000 (10:39 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 25 Apr 2012 08:39:31 +0000 (10:39 +0200)

Trivial merge