]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into convert-oc_config
authorBart Visscher <bartv@thisnet.nl>
Thu, 4 Jul 2013 16:23:47 +0000 (18:23 +0200)
committerBart Visscher <bartv@thisnet.nl>
Thu, 4 Jul 2013 16:23:47 +0000 (18:23 +0200)
commitad9458e85d319c12575293e0b25069d35db15720
tree83801af641b47e346bef0d72821b26e5d4cfb0fa
parent32d69f68896c08e216bc0e84db409d00ec654856
parentf67fc78531a0180d3c60edb849b29ac744bacbaa
Merge branch 'master' into convert-oc_config

Conflicts:
lib/config.php