]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into disable-anon-upload-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:55:20 +0000 (11:55 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:55:20 +0000 (11:55 +0200)
commit840e96cda39b97dc0c42b52946f0e98c62df3bf4
treef8d8961af7b96b013289d7a0c1018ee40a996aea
parent934f2e94a30e21bbd0c87f347bb05de3437f66db
parent342a54bf7b31fe21362bac59cfa80a5d30ce9362
Merge branch 'master' into disable-anon-upload-master

Conflicts:
settings/templates/admin.php
settings/admin.php
settings/templates/admin.php