]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fix_3728_with_file_exists_dialog
authorJörn Friedrich Dreyer <jfd@butonic.de>
Wed, 18 Sep 2013 12:15:28 +0000 (14:15 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Wed, 18 Sep 2013 12:15:28 +0000 (14:15 +0200)

Trivial merge