]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99a0581 3b5d5a2)
Merge branch 'stable5' of github.com:owncloud/core into stable5
authorThomas Müller <thomas.mueller@tmit.eu>
Sun, 4 Aug 2013 22:25:22 +0000 (00:25 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Sun, 4 Aug 2013 22:25:22 +0000 (00:25 +0200)
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