Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-01-03 13:41:19 +00:00
commit 3d836a6d76

View File

@ -375,7 +375,7 @@ module.exports = React.createClass({
{ _t("For security, logging out will delete any end-to-end " +
"encryption keys from this browser. If you want to be able " +
"to decrypt your conversation history from future Riot sessions, " +
"please export your room keys for safe-keeping.") }.
"please export your room keys for safe-keeping.") }
</div>,
button: _t("Sign out"),
extraButtons: [