Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into...

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

diff --cc apps/files/js/file-upload.js
index 2c42f29445f3bd53ab8995fa04385ffb82217403,3cf43dff506560883772c55f86298dc190ea2510..d1f2dabf831604ad39bc713852b1308d080da321
--- 1/apps/files/js/file-upload.js
--- 2/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@@ -169,14 -169,14 +169,14 @@@ OC.Upload = 
        },
        /**
         * TODO checks the list of existing files prior to uploading and shows a simple dialog to choose
 -       * skip all, replace all or choosw which files to keep
 +       * skip all, replace all or choose which files to keep
-        * @param array selection of files to upload
-        * @param callbacks to call:
-        *              onNoConflicts,
-        *              onSkipConflicts,
-        *              onReplaceConflicts,
-        *              onChooseConflicts,
-        *              onCancel
+        * @param {array} selection of files to upload
+        * @param {object} callbacks - object with several callback methods
+        * @param {function} callbacks.onNoConflicts
+        * @param {function} callbacks.onSkipConflicts
+        * @param {function} callbacks.onReplaceConflicts
+        * @param {function} callbacks.onChooseConflicts
+        * @param {function} callbacks.onCancel
         */
        checkExistingFiles: function (selection, callbacks){
                // TODO check filelist before uploading and show dialog on conflicts, use callbacks