summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-01-29 15:54:19 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-01-29 15:54:19 +0100
commit5c8e5e223d07780196680732544fa66a5fa2503c (patch)
tree248992c3a931f5e42cdcceadf3a6cf75ef61c806 /apps/files_encryption
parent65ec950b27d625b8184fbff28ecb7778f55415d9 (diff)
parent8a091629dcd9282c1aa9f73094282bf9b1afcb87 (diff)
downloadnextcloud-server-5c8e5e223d07780196680732544fa66a5fa2503c.tar.gz
nextcloud-server-5c8e5e223d07780196680732544fa66a5fa2503c.zip
Merge pull request #13728 from owncloud/federated_cloud
rename 'server-to-server sharing' to 'federated cloud'
Diffstat (limited to 'apps/files_encryption')
0 files changed, 0 insertions, 0 deletions