summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-20 02:25:56 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-20 02:25:56 +0200
commit31037241e11122203f2ea73b6c1b126a14bfdae2 (patch)
treec783857d7a61c48d913a252fb05e99e6389fb937 /AUTHORS
parent58a8d67a9b3c48567bcc40cc02444311c6773275 (diff)
parent71668cf08a57742c0a585c9e2fe7e4bb0ea08165 (diff)
downloadnextcloud-server-31037241e11122203f2ea73b6c1b126a14bfdae2.tar.gz
nextcloud-server-31037241e11122203f2ea73b6c1b126a14bfdae2.zip
Merge branch 'master' into files_encryption
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions