]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1b37e4 de4236b)
Merge branch 'master' of https://github.com/nextcloud/server
authorroot <roger.szabo@web.de>
Mon, 25 Jul 2016 08:56:14 +0000 (16:56 +0800)
committerroot <roger.szabo@web.de>
Mon, 25 Jul 2016 08:56:14 +0000 (16:56 +0800)
1  2 
lib/private/Server.php patch | diff1 | diff2 | blob | history

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