]> source.dussan.org Git - nextcloud-server.git/commit
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 19 Sep 2013 15:23:07 +0000 (08:23 -0700)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 19 Sep 2013 15:23:07 +0000 (08:23 -0700)
commit09cfebe93653f9168bdfb8e480a47c50a28868ea
tree9370b9d5ac99f148d2bc724f76c805b772af7d2d
parentbd5cb1d801a16933b7b75af5c514caec2afa5fef
parent7e0631b3b81a5669620122964d0326ead187de30
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog

file upload conflicts dialog