Michael Telatynski cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot ... Conflicts: src/components/views/rooms/RoomBreadcrumbs.js src/components/views/rooms/RoomTile.js		2020-04-17 12:58:54 +01:00
..
auth	Login block on initialSync with spinners	2020-04-15 12:21:49 +01:00
avatars	Fix scaling of the avatar in UserInfo	2019-12-19 12:27:25 +00:00
context_menus	Fix Message Context Menu options not displaying: block	2020-04-16 01:46:32 +01:00
dialogs	Update margins to improve grouping	2020-04-08 14:48:50 +01:00
directory	Allow network dropdown to be scrollable and fix context menu window padding calc	2020-04-14 17:34:39 +01:00
elements	iterate pills in rich text styling	2020-04-17 12:30:09 +01:00
emojipicker	Use variables for the rem values.	2020-03-31 15:26:23 +01:00
globals
groups
messages	Merge pull request #4396 from matrix-org/t3chguy/fix_MVideoBody_FilePanel	2020-04-14 15:02:28 +01:00
right_panel	Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon	2020-04-03 18:38:30 +01:00
room_settings	more margin between published and local addresses	2020-03-16 18:30:40 +01:00
rooms	Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot	2020-04-17 12:58:54 +01:00
settings	Use variables for the rem values.	2020-03-31 15:26:23 +01:00
terms	Use variables for the rem values.	2020-03-31 15:26:23 +01:00
verification	Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js	2020-04-07 19:03:12 +01:00
voip	Use variables for the rem values.	2020-03-31 15:26:23 +01:00