]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into disable-anon-upload-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:36:52 +0000 (11:36 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:36:52 +0000 (11:36 +0200)
1  2 
apps/files/templates/index.php

Simple merge