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

This commit is contained in:
Weblate 2018-06-22 09:56:22 +00:00
commit 8eeff746d3

View file

@ -913,6 +913,8 @@ module.exports = React.createClass({
},
uploadFile: async function(file) {
dis.dispatch({action: 'focus_composer'});
if (MatrixClientPeg.get().isGuest()) {
dis.dispatch({action: 'view_set_mxid'});
return;