Michael Telatynski 9c500e3544 Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody ...

 Conflicts:

	src/components/views/messages/TextualBody.js

2020-01-06 11:51:35 +00:00

..

GenericElementContextMenu.js

Correct case of propTypes property in ES6 React Components. React 16

2019-09-06 14:27:33 +01:00

GenericTextContextMenu.js

Correct case of propTypes property in ES6 React Components. React 16

2019-09-06 14:27:33 +01:00

GroupInviteTileContextMenu.js

Migrate away from Legacy React Contexts

2019-12-17 17:26:12 +00:00

MessageContextMenu.js

Change ref handling in TextualBody to prevent it parsing generated nodes

2019-12-08 01:01:19 +00:00

RoomTileContextMenu.js

s/ContextualMenu/ContextMenu/

2019-12-02 23:21:59 +00:00

StatusMessageContextMenu.js

Migrate away from Legacy React Contexts

2019-12-17 17:26:12 +00:00

TagTileContextMenu.js

Migrate away from Legacy React Contexts

2019-12-17 17:26:12 +00:00

TopLeftMenu.js

Fix wrong scope binding on openHelp for TopLeftMenu

2019-12-23 19:29:43 +00:00

WidgetContextMenu.js

s/ContextualMenu/ContextMenu/

2019-12-02 23:21:59 +00:00