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

2018-01-03 13:41:19 +00:00 · 2018-01-03 13:41:19 +00:00 · 3d836a6d76
parent 08e6d123a2 63335f70e5
commit 3d836a6d76
1 changed files with 1 additions and 1 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -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: [