Merge branch 'master' into vector

2015-07-16 12:44:42 +01:00 · 2015-07-16 12:44:42 +01:00 · 41f659db4c
commit 41f659db4c
parent a6f857e9d8 df790c1b54
5 changed files with 121 additions and 70 deletions
--- a/src/controllers/pages/MatrixChat.js
+++ b/src/controllers/pages/MatrixChat.js
@ -197,7 +197,7 @@ module.exports = {
        dis.dispatch({action: 'focus_composer'});
    },

-    showScreen(screen, params) {
+    showScreen: function(screen, params) {
        if (screen == 'register') {
            dis.dispatch({
                action: 'start_registration',