]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b48dffa 4ccbace)
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
authorVicDeo <dubiniuk@owncloud.com>
Mon, 7 Oct 2013 15:19:40 +0000 (08:19 -0700)
committerVicDeo <dubiniuk@owncloud.com>
Mon, 7 Oct 2013 15:19:40 +0000 (08:19 -0700)
File conflicts dialog fixes

1  2 
apps/files/js/files.js patch | diff1 | diff2 | blob | history

diff --cc apps/files/js/files.js
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server