]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
authorJörn Friedrich Dreyer <jfd@butonic.de>
Wed, 23 Oct 2013 10:02:06 +0000 (12:02 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Wed, 23 Oct 2013 10:02:06 +0000 (12:02 +0200)
commit3121dc8cb5e436af3f465dd8a5da5ddcf43377e0
tree60f5cb38c2439403b9edb83a13ac62f781148c13
parent8ed73e5cedac5e22a8e50d1fdf04feb400b676fd
parent2d14daf36bf6c808e55895c78b42144942b73246
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
apps/files/js/files.js