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

2018-10-23 02:18:12 +00:00 · 2018-10-23 02:18:12 +00:00 · 11a0437df1
parent 6774fd7acc 879ef7f52b
commit 11a0437df1
1 changed files with 1 additions and 0 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -1034,6 +1034,7 @@ export default React.createClass({
                { warnings }
                </span>
            ),
+            button: _t("Leave"),
            onFinished: (shouldLeave) => {
                if (shouldLeave) {
                    const d = MatrixClientPeg.get().leave(roomId);