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

@ -93,7 +93,7 @@ export default class DMRoomMap {
return {userId, roomId};
}
}
}).filter((ids) => !!ids); //filter out
}).filter((ids) => !!ids); //filter out
// these are actually all legit self-chats
// bail out
if (!guessedUserIdsThatChanged.length) {

View file

@ -77,7 +77,7 @@ const ALLOWED_BLOB_MIMETYPES = {
'audio/x-pn-wav': true,
'audio/flac': true,
'audio/x-flac': true,
}
};
/**
* Decrypt a file attached to a matrix event.