summaryrefslogtreecommitdiffstats
path: root/COPYING-README
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-09 13:54:58 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-09 13:54:58 +0100
commit5d456c7cc21f7640435c4638932984a52b4cdbac (patch)
tree0227a865782fab4895f602a7c118d92e21998cbb /COPYING-README
parentd50c7391d8e78c9555b073fb9ccc6a91d5da34bc (diff)
parentd8b8abb429d3d66598a16d25cf55f7dc19e3f996 (diff)
downloadnextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.tar.gz
nextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.zip
Merge branch 'master' into memcache-public
Diffstat (limited to 'COPYING-README')
0 files changed, 0 insertions, 0 deletions