]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 11 Apr 2012 02:44:13 +0000 (22:44 -0400)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 11 Apr 2012 02:44:13 +0000 (22:44 -0400)
commit613e15035e3f02a212c9f3ec11ae98fc3ef682c8
tree4b6b93ceb338ae8abd7253faf41526e41ae72d74
parentef1e359c7c10f4ebd8230b4fa79bd0b284b5186e
parent9f547a1b3987838fda8db238a8999c9f474bb542
Merge branch 'master' into sabredav_1.6