Merge branch 'develop' into experimental

This commit is contained in:
Bruno Windels 2018-10-31 14:54:22 +01:00
commit ba83166661
80 changed files with 760 additions and 263 deletions

View file

@ -712,7 +712,7 @@ module.exports = withMatrixClient(React.createClass({
if (!member || !member.membership || member.membership === 'leave') {
const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
const onInviteUserButton = async () => {
const onInviteUserButton = async() => {
try {
await cli.invite(roomId, member.userId);
} catch (err) {