Michael Telatynski faa9124f2b Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345 ...

 Conflicts:

	src/components/views/rooms/RoomTile2.tsx

2020-07-08 08:57:01 +01:00

..

auth

delint

2020-06-26 14:22:59 +01:00

avatars

Fix a couple badge alignment issues with community invites

2020-07-02 14:05:31 -06:00

context_menus

Small fixes

2020-04-27 18:36:05 +01:00

dialogs

Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2

2020-06-30 18:06:12 +01:00

directory

Network Dropdown fix things not scrolling properly

2020-04-18 15:08:15 +01:00

elements

Make Styled Radio Button outlines default-off

2020-07-03 19:27:45 +01:00

emojipicker

Fix Emoji Picker footer being too small if text overflows

2020-05-24 20:00:02 +01:00

groups

…

messages

Rename trash (custom).svg as electron doesn't like serving files with spaces

2020-05-12 16:16:47 +01:00

right_panel

Small fixes

2020-04-27 18:36:05 +01:00

room_settings

…

rooms

Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345

2020-07-08 08:57:01 +01:00

settings

revert dark mode separator colour

2020-07-03 19:53:06 +01:00

terms

…

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

…