summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2013-01-14 17:06:48 +0000
committerSam Tuke <samtuke@owncloud.com>2013-01-14 17:06:48 +0000
commit23db814cbd09e89824f6fee4fcef9e64a54c0458 (patch)
treec2a46a0c40ea6868403f9116326f14a2321fe05e /apps/files_encryption
parent1641ed8ac7284f71b974b49336957cb5b6d1798c (diff)
parentde0ed634f2fb1bb9fbb93f6c0a66882dea42e288 (diff)
downloadnextcloud-server-23db814cbd09e89824f6fee4fcef9e64a54c0458.tar.gz
nextcloud-server-23db814cbd09e89824f6fee4fcef9e64a54c0458.zip
Merge branch 'master' into files_encryption
Diffstat (limited to 'apps/files_encryption')
0 files changed, 0 insertions, 0 deletions