matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into matthew/warn-unknown-devices

Browse Source
This commit is contained in:
Richard van der Hoff
2017-01-25 11:03:23 +00:00
parent 4ccd649358 32f42d59b1
commit 5245c7f2ab
45 changed files with 403 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/algorithms/base.js
View File

@@ -85,7 +85,7 @@ module.exports.EncryptionAlgorithm = EncryptionAlgorithm;
* @param {string=} oldMembership previous membership
*/
EncryptionAlgorithm.prototype.onRoomMembership = function(
event, member, oldMembership
event, member, oldMembership,
) {};
/**