Michael Telatynski 1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode ...

 Conflicts:

	package.json

2020-05-14 10:50:42 +01:00

..

auth

Replace png flags with use of Twemoji

2020-05-11 22:04:18 +01:00

avatars

Revert previous fix

2020-04-27 17:35:52 +01:00

context_menus

View Source should target the replacing event rather than the root one

2020-05-11 15:43:34 +01:00

create_room

…

dialogs

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

2020-05-14 10:50:42 +01:00

directory

Fix missed copy

2020-03-16 12:28:20 +00:00

elements

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

2020-05-14 10:50:42 +01:00

emojipicker

Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets

2020-03-28 00:51:01 +00:00

globals

…

groups

Silence usages of componentWillReceiveProps

2020-04-01 14:35:39 -06:00

messages

Bring back UnknownBody for UISIs

2020-05-08 19:15:59 +01:00

right_panel

Merge pull request #4580 from matrix-org/dbkr/dont_npe_if_no_device

2020-05-12 14:36:54 +01:00

room_settings

Make RoomPublishSetting import-skinnable

2020-04-16 17:13:33 +01:00

rooms

Fix sign in / up links on previewed rooms

2020-05-12 15:24:12 +01:00

settings

Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s

2020-05-14 08:10:39 +00:00

terms

…

toasts

remove UI for upgrading 4S to sym enc

2020-05-12 14:29:11 +02:00

verification

Provide separate translatable for case where we have no device

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

voip

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00