]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of https://github.com/nextcloud/server
authorroot <roger.szabo@web.de>
Wed, 27 Jul 2016 07:17:29 +0000 (15:17 +0800)
committerroot <roger.szabo@web.de>
Wed, 27 Jul 2016 07:17:29 +0000 (15:17 +0800)
1  2 
lib/private/Server.php

Simple merge