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	Allow connecting to an IS from address picker	2019-08-29 15:28:34 +01:00
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	…
directory	…
elements	…
emojipicker	…
globals	…
groups	…
messages	…
right_panel	…
room_settings	…
rooms	…
settings	…
terms	Add an inline terms agreement component	2019-08-19 22:59:33 -06:00
verification	Change SAS to decimal / emoji	2019-02-08 14:57:36 +00:00
voip	…