Michael Telatynski f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 ...

 Conflicts:

	src/components/structures/TimelinePanel.js

	src/components/views/context_menus/MessageContextMenu.js

	src/components/views/right_panel/UserInfo.tsx

	src/dispatcher/actions.ts

2021-06-17 15:31:06 +01:00

..

CallContextMenu.tsx

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:29 -07:00

DialpadContextMenu.tsx

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:29 -07:00

GenericElementContextMenu.js

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:29 -07:00

GenericTextContextMenu.js

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:29 -07:00

GroupInviteTileContextMenu.js

Convert a bunch more js-sdk imports to absolute paths

2021-03-18 20:50:34 -06:00

IconizedContextMenu.tsx

Consolidate all the work thus far

2020-09-08 15:43:38 +01:00

MessageContextMenu.js

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

2021-06-17 15:31:06 +01:00

StatusMessageContextMenu.js

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:29 -07:00

TagTileContextMenu.js

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:29 -07:00

WidgetContextMenu.tsx

Fix Stickerpicker context menu

2021-06-07 09:22:47 +01:00