Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

Browse Source

...

This commit is contained in:

Jorik Schellekens

2020-04-28 15:38:46 +01:00

parent eb72245493 cf05beb4b8

commit 1b83faaa8d

51 changed files with 1699 additions and 333 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

res/img/03b381.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 169 B

BIN

res/img/368bd6.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 171 B

BIN

res/img/ac3ba8.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 170 B