Merge branch 'develop' into t3chguy/password_completion

2020-02-05 20:24:37 +00:00
parent 920daa3125 73b177d075
commit 4d0d6cdaa4
150 changed files with 2181 additions and 4589 deletions
@@ -113,7 +113,7 @@ export default createReactClass({
            description:
                <div>
                    { _t(
-                        'Changing password will currently reset any end-to-end encryption keys on all devices, ' +
+                        'Changing password will currently reset any end-to-end encryption keys on all sessions, ' +
                        'making encrypted chat history unreadable, unless you first export your room keys ' +
                        'and re-import them afterwards. ' +
                        'In future this will be improved.',