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

This commit is contained in:
Weblate 2018-04-26 10:05:44 +00:00
commit f51211ac93

View file

@ -337,7 +337,7 @@ module.exports = React.createClass({
if (this.context.appConfig && this.context.appConfig.cross_origin_renderer_url) {
renderer_url = this.context.appConfig.cross_origin_renderer_url;
}
renderer_url += "?origin=" + encodeURIComponent(document.origin);
renderer_url += "?origin=" + encodeURIComponent(window.location.origin);
return (
<span className="mx_MFileBody">
<div className="mx_MFileBody_download">