]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 22 Oct 2013 21:06:53 +0000 (23:06 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 22 Oct 2013 21:06:53 +0000 (23:06 +0200)
commit9019ad550fc4c8e6d636eaaf98062ba2e495d135
tree92b0e3e7e34dd1a5497fc2f62b30085af41317cd
parentca3771f8fd761a51ea7bbe123dcb16c5da7f4045
parentd2fa0f5ff208dc5e043109a8d08b58bf344d24b3
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename

Conflicts:
apps/files/js/filelist.js
apps/files/js/filelist.js