]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into mimetype-defaults
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 15 Aug 2013 22:13:10 +0000 (00:13 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 15 Aug 2013 22:13:10 +0000 (00:13 +0200)
commit7279a07ca20949cf3cee82faf064d6aae8cf0a99
tree01d912d1743db2e34225383d3f8b9783c9b6e295
parentd91104e120d570eaf3d80c23c5caf6b597b24db7
parentbd1895bdf8dff07bf9dc9803ce991e39daa52acc
Merge branch 'master' into mimetype-defaults

Conflicts:
apps/files/ajax/newfile.php
apps/files/ajax/newfile.php