]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c30c153 89ed000)
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into...
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 19 Sep 2013 09:15:20 +0000 (11:15 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 19 Sep 2013 09:15:20 +0000 (11:15 +0200)
commiteea02cee2fdec2fd40acf174349aab4e813658c9
treeb68d865027925ca56d2e890892094596d0590ee4tree | snapshot
parentc30c153ea517403ee479be739a503bd91bab272ecommit | diff
parent89ed0007c021f27d1a867682005e0c36bcad433acommit | diff
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

Conflicts:
apps/files/js/file-upload.js
apps/files/js/file-upload.js diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server