Merge branch 'develop' into new-guest-access

Conflicts: src/components/structures/MatrixChat.js
2017-05-22 16:19:10 +01:00 · 2017-05-22 16:19:10 +01:00 · 05aaa599cc
commit 05aaa599cc
parent e4d35881f6 0d70f796e2
43 changed files with 839 additions and 1047 deletions
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@ -147,6 +147,7 @@ export default WithMatrixClient(React.createClass({
        return (
            <form className="mx_UserSettings_profileTableRow" onSubmit={this._onAddMsisdnSubmit}>
                <div className="mx_UserSettings_profileLabelCell">
+                    <label>Phone</label>
                </div>
                <div className="mx_UserSettings_profileInputCell">
                    <div className="mx_UserSettings_phoneSection">