diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-08 12:13:24 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-08 12:13:24 +0200 |
commit | 053b55721d69a54b8d9460868d9e6f3edc606271 (patch) | |
tree | 873135b3a47e0ef03abcfdbbcf251b66f37863fc /lib/private/server.php | |
parent | c3286402a846bf874ae78a61880442f8ebfd7ba9 (diff) | |
parent | 2123ef57d830abe24684b54f9819b75ab780834e (diff) | |
download | nextcloud-server-053b55721d69a54b8d9460868d9e6f3edc606271.tar.gz nextcloud-server-053b55721d69a54b8d9460868d9e6f3edc606271.zip |
Merge branch 'master' into fixing-appframework-master
Diffstat (limited to 'lib/private/server.php')
0 files changed, 0 insertions, 0 deletions