Michael Telatynski eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials ...

 Conflicts:

	src/i18n/strings/en_EN.json

2020-12-01 16:33:29 +00:00

..

css

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials

2020-12-01 16:33:29 +00:00

fonts

use Inter as font

2020-06-30 13:28:19 +02:00

img

Replace *ServerConfig and SignInToText with ServerPicker

2020-11-25 09:46:56 +00:00

media

move default ringtones over from riot-web

2018-04-12 00:25:36 +01:00

themes

Increase Dialog button mixin border-radius to 8px

2020-11-20 15:45:34 +00:00