]> source.dussan.org Git - nextcloud-server.git/commit
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)
commitd8b7e42fc1626c64a28a31cfbde4a3789b9097bf
treeff67b75013249405357f73d2f35d52302df3aa75
parentb48dffa9a302881e8d1effe9d03bc97e96adc23b
parent4ccbace68df0150cdadaa8e680a7cb2639e8c628
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes

File conflicts dialog fixes
apps/files/js/files.js