fix_react_complaining

Commit

6 years ago

Merge branches 'develop' and 't3chguy/fix_react_complaining' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_react_complaining Conflicts: src/components/views/elements/Pill.js

Author

t3chguy

Parents

ac1d9b03

4ab7b9ba

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

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