Merge branch 'develop' into matthew/roomsettings2

2016-01-13 17:33:32 +00:00
parent ad434cb82e 7232659195
commit 68f846e129
7 changed files with 90 additions and 9 deletions
@@ -155,7 +155,8 @@ function loadApp() {
                registrationUrl={makeRegistrationUrl()}
                ConferenceHandler={VectorConferenceHandler}
                config={configJson}
-                startingQueryParams={parseQsFromFragment(window.location)} />,
+                startingQueryParams={parseQsFromFragment(window.location)}
+                enableGuest={true} />,
            document.getElementById('matrixchat')
        );
    }