aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/js
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-05-15 11:42:41 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-05-15 11:42:41 +0200
commit335f2ca32190e866ab1d222b693a273cb6778ac1 (patch)
treebc631c408b79929450ef731157466103117fce15 /apps/files_encryption/js
parentd8ae2fa80d004a7c9de7e1c6d012a6c0b6a423aa (diff)
parent137039d35a6be69f42f79bf2bd15d7041a815c3b (diff)
downloadnextcloud-server-335f2ca32190e866ab1d222b693a273cb6778ac1.tar.gz
nextcloud-server-335f2ca32190e866ab1d222b693a273cb6778ac1.zip
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Diffstat (limited to 'apps/files_encryption/js')
0 files changed, 0 insertions, 0 deletions