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

Browse Source

...

This commit is contained in:

Michael Telatynski

2020-05-07 09:56:21 +01:00

parent 3e35cffae7 7f030a149e

commit f0085a9feb

81 changed files with 2557 additions and 803 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

res/img/03b381.png

BIN

Binary file not shown.

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

res/img/368bd6.png

BIN

Binary file not shown.

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

res/img/ac3ba8.png

BIN

Binary file not shown.

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