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

Browse Source

...

This commit is contained in:

Michael Telatynski

2017-08-02 12:15:00 +01:00

parent 17262ad80d 9010f96e60

commit fd454b476a

268 changed files with 27696 additions and 5893 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

1086

src/components/structures/MatrixChat.js

File diff suppressed because it is too large Load Diff