aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/ajax
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-05-15 16:13:29 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-05-15 16:13:29 +0200
commit1f5ed65b121897d683fc1b5aec58938677309c1c (patch)
treeed9e7000668382486b81524e3e515d110d6a9b3c /apps/files_encryption/ajax
parent64d94c540aeaba67e2f779b2551c72a80334aa3e (diff)
parent63a790b415d0ad54f5d769976ff5c00f1c8df0eb (diff)
downloadnextcloud-server-1f5ed65b121897d683fc1b5aec58938677309c1c.tar.gz
nextcloud-server-1f5ed65b121897d683fc1b5aec58938677309c1c.zip
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Diffstat (limited to 'apps/files_encryption/ajax')
0 files changed, 0 insertions, 0 deletions