Michael Telatynski 1bc9d344ae Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting ...

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

# Conflicts:
#	src/components/views/messages/TextualBody.js

2018-01-10 11:54:58 +00:00

..

avatars

Remove use of deprecated React.PropTypes

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

create_room

Remove use of deprecated React.PropTypes

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

dialogs

Remove use of deprecated React.PropTypes

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

elements

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting

2018-01-10 11:54:58 +00:00

groups

Remove use of deprecated React.PropTypes

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

login

Remove use of deprecated React.PropTypes

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

messages

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting

2018-01-10 11:54:58 +00:00

room_settings

Merge pull request #1677 from aidalgol/PropTypes

2018-01-05 11:53:55 +00:00

rooms

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting

2018-01-10 11:54:58 +00:00

settings

Remove use of deprecated React.PropTypes

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

voip

Remove use of deprecated React.PropTypes

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