Michael Telatynski 6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus ...

 Conflicts:

	src/components/views/context_menus/RoomTileContextMenu.js

2019-11-28 16:25:59 +00:00

..

_MessageContextMenu.scss

move menu padding from wrapper so menu can have full-width elements

2018-10-23 15:22:41 +02:00

_RoomTileContextMenu.scss

Manually fix remaining stylelint issues

2019-07-10 16:56:40 +01:00

_StatusMessageContextMenu.scss

Show spinner while waiting on status message to commit

2019-01-16 09:33:39 -06:00

_TagTileContextMenu.scss

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00

_TopLeftMenu.scss

Migrate all standard Context Menus over to new custom framework

2019-11-11 17:53:17 +00:00

_WidgetContextMenu.scss

Fix indentation

2019-11-20 19:21:10 -07:00