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
..
auth	…
avatars	…
context_menus	Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus	2019-11-28 16:25:59 +00:00
dialogs	It's called an "Integration Manager" (singular)	2019-11-20 20:14:25 -07:00
directory	…
elements	use FormButton in verification request tile too and dedupe styles	2019-11-22 16:32:50 +01:00
emojipicker	…
globals	…
groups	…
messages	use FormButton in verification request tile too and dedupe styles	2019-11-22 16:32:50 +01:00
right_panel	…
room_settings	…
rooms	Merge pull request #3653 from matrix-org/bwindels/fixe2eicons	2019-11-21 19:01:17 +00:00
settings	It's called an "Integration Manager" (singular)	2019-11-20 20:14:25 -07:00
terms	…
verification	…
voip	…