summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-22 14:26:52 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-22 14:26:52 +0100
commit1a9ded981b130b3917e6665dc23be33d5a6ae2e0 (patch)
tree7e8a42f6ae6ff0b5db2621bebb5827cd6d562322 /apps/files_encryption
parentc20319d37701efb9d32c38dd71880739ca75b33f (diff)
parentc5c843bfefb9e678b65bf30c42082676db07bc3c (diff)
downloadnextcloud-server-1a9ded981b130b3917e6665dc23be33d5a6ae2e0.tar.gz
nextcloud-server-1a9ded981b130b3917e6665dc23be33d5a6ae2e0.zip
Merge branch 'master' into enc
Diffstat (limited to 'apps/files_encryption')
0 files changed, 0 insertions, 0 deletions