1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00

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

This commit is contained in:
Weblate
2017-12-07 15:56:15 +00:00

View File

@@ -142,7 +142,6 @@ module.exports = React.createClass({
});
app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
console.log("wait for iframe load:", app.waitForIframeLoad, app.id);
}
app.url = this.encodeUri(app.url, params);