]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32d69f6 f67fc78)
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)
Conflicts:
lib/config.php


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server