1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00

Merge branch 'develop' into matthew/roomsettings2

This commit is contained in:
Matthew Hodgson
2016-01-13 12:55:30 +00:00

View File

@@ -59,7 +59,7 @@ function synthesizeReceipt(userId, event, receiptType) {
* @prop {string} roomId The ID of this room.
* @prop {string} name The human-readable display name for this room.
* @prop {Array<MatrixEvent>} timeline The ordered list of message events for
* this room.
* this room, with the oldest event at index 0.
* @prop {object} tags Dict of room tags; the keys are the tag name and the values
* are any metadata associated with the tag - e.g. { "fav" : { order: 1 } }
* @prop {object} accountData Dict of per-room account_data events; the keys are the