]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into ext-fs-irods-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:40:28 +0000 (11:40 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:40:28 +0000 (11:40 +0200)
1  2 
apps/files_external/lib/config.php

Simple merge