]> 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>
Thu, 19 Sep 2013 15:00:54 +0000 (17:00 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Thu, 19 Sep 2013 15:00:54 +0000 (17:00 +0200)
commit7e0631b3b81a5669620122964d0326ead187de30
tree9370b9d5ac99f148d2bc724f76c805b772af7d2d
parent98ff8478301676c99ffefd5756ad22466dfb6acf
parentbd5cb1d801a16933b7b75af5c514caec2afa5fef
Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
apps/files/js/filelist.js
apps/files/ajax/upload.php
apps/files/css/files.css
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js