]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff4d621 688fe0b)
Merge branch 'master' into no-inline-js
authorLukas Reschke <lukas@statuscode.ch>
Fri, 25 Jan 2013 15:11:07 +0000 (16:11 +0100)
committerLukas Reschke <lukas@statuscode.ch>
Fri, 25 Jan 2013 15:11:07 +0000 (16:11 +0100)
1  2 
config/config.sample.php patch | diff1 | diff2 | blob | history

diff --cc config/config.sample.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server