matrix-react-sdk
9a15d4cf - Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event

Commit
6 years ago
Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event  Conflicts:  src/i18n/strings/en_EN.json
Author
Loading