]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fix_3728_with_file_exists_dialog
authorJörn Friedrich Dreyer <jfd@butonic.de>
Tue, 10 Sep 2013 14:54:48 +0000 (16:54 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Tue, 10 Sep 2013 14:54:48 +0000 (16:54 +0200)
commitcec932f29252da7d47ddcbb33003ba11252d5753
tree3c17c41b075f37b537c5851325940ab951ce2a52
parente17c40acb79a6848af0481d434ec7643c5c9bf03
parent72689f643b631061777149d96f6f170f7722e894
Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
apps/files/js/file-upload.js
apps/files/css/files.css
apps/files/js/file-upload.js