Michael Telatynski 1d90835de0 Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to ...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/RoomView.js

2018-04-04 11:08:34 +01:00

..

MAudioBody.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

MessageEvent.js

Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.

2018-03-12 13:56:02 +00:00

MFileBody.js

typo

2018-02-15 20:20:25 +00:00

MImageBody.js

Cleanup timeout before unmount.

2018-03-09 21:12:56 +00:00

MStickerBody.js

Add back in body 'ref'

2018-03-29 21:16:12 +01:00

MVideoBody.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

RoomAvatarEvent.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

SenderProfile.js

Only calculate displayed groups if flair enabled

2017-11-28 15:49:11 +00:00

TextualBody.js

Merge

2018-03-24 17:52:49 +00:00

TextualEvent.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

UnknownBody.js

Handle redaction with no sender

2017-10-25 17:37:20 +01:00