aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/js/settings-admin.js
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-05-15 23:49:41 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-05-15 23:49:41 +0200
commit3c779b0632809718b3f39403fdb68b7e160b5a0b (patch)
treefc839ff3ed0a229dc6c887b467d7402359d9aac0 /apps/files_encryption/js/settings-admin.js
parent990f23c0249682043c9e0dd42f33c478e2aa9131 (diff)
parentdfddaf8fbf5ff515f26ff462c7ba6166b3d0ed18 (diff)
downloadnextcloud-server-3c779b0632809718b3f39403fdb68b7e160b5a0b.tar.gz
nextcloud-server-3c779b0632809718b3f39403fdb68b7e160b5a0b.zip
Merge branch 'master' into hooks
Diffstat (limited to 'apps/files_encryption/js/settings-admin.js')
0 files changed, 0 insertions, 0 deletions