diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-06-26 14:51:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-26 14:51:00 +0200 |
commit | db6361ef0314868edc9d58a81c0806c8c758af0a (patch) | |
tree | a2c168943d0e15a2d28febf82e31e74b15504117 /lib/private/Server.php | |
parent | 03449dcb9a56e642ff4eee31145498bbaeb83319 (diff) | |
parent | 7a9d60d87eb8e4414e5fe05830b088d426ff810d (diff) | |
download | nextcloud-server-db6361ef0314868edc9d58a81c0806c8c758af0a.tar.gz nextcloud-server-db6361ef0314868edc9d58a81c0806c8c758af0a.zip |
Merge pull request #226 from nextcloud/master-upstream-sync
[Master] upstream sync
Diffstat (limited to 'lib/private/Server.php')
0 files changed, 0 insertions, 0 deletions