From: Weblate Date: Wed, 2 Sep 2015 12:05:34 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~15 X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/a8cb2b83429c0f5b75f95f639cf8987f2a3c3608?hp=079db9eec02f1002e3bca2ae8e0a890cc1dd138e Merge remote-tracking branch 'origin/master' --- diff --git a/README.md b/README.md index b2fbe33..4c96ce9 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ By activating this feature, you have to be aware of few things: - During the download, the server will decrypt on the fly (and use resource). - This feature needs to have the mcrypt php module. - File de-duplication will stop to work (as we can't compare two encrypted files). -- Be sure you server do not log client's requests. -- Don't forget to activate https. +- Be sure your server do not log client's requests. +- Don't forget to enable https. In a next step, encryption will be made by the client (in javascript), see issue #10.