]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e06cf4 b6f7956)
Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
authorJoas Schilling <nickvergessen@gmx.de>
Thu, 16 Apr 2015 09:57:14 +0000 (11:57 +0200)
committerJoas Schilling <nickvergessen@gmx.de>
Thu, 16 Apr 2015 09:57:14 +0000 (11:57 +0200)
files_encryption -> encryption


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server