]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into convert-oc_config
authorBart Visscher <bartv@thisnet.nl>
Mon, 8 Jul 2013 15:59:50 +0000 (17:59 +0200)
committerBart Visscher <bartv@thisnet.nl>
Mon, 8 Jul 2013 15:59:50 +0000 (17:59 +0200)
commit52553c64ed59f4a30ad42586abd8e06a8446ecd9
tree902e6debac03494ba7c426afa5db96909d3da690
parent492a35737c634fee27b0eb9d3ea6425bc6d98396
parent02d2e41e04735e91c94864a98c5eed89b6ceb7f7
Merge branch 'master' into convert-oc_config

Conflicts:
lib/config.php
lib/config.php