]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd5cb1d 7e0631b)
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)
file upload conflicts dialog


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server