summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-09-28 20:39:19 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-09-28 20:39:19 +0200
commit6979fd343b3c8b96a65f015cd2e9d86db492a1a4 (patch)
tree9b60ec8ba45395e58938c20c724d094ebb529b3a /lib
parent57f37c876b59d11dae8b4325bed5fa57de52ecd4 (diff)
parent1097c3ce6368355c5240af8cc0fb14182a60d2c4 (diff)
downloadnextcloud-server-6979fd343b3c8b96a65f015cd2e9d86db492a1a4.tar.gz
nextcloud-server-6979fd343b3c8b96a65f015cd2e9d86db492a1a4.zip
Merge branch 'master' into appframework-master
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions