From: Jörn Friedrich Dreyer Date: Wed, 18 Sep 2013 12:15:28 +0000 (+0200) Subject: Merge branch 'master' into fix_3728_with_file_exists_dialog X-Git-Tag: v6.0.0alpha2~159^2~15 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec1949f5ed595f3da5907d1493727e156ae9a5a7;p=nextcloud-server.git Merge branch 'master' into fix_3728_with_file_exists_dialog --- ec1949f5ed595f3da5907d1493727e156ae9a5a7