Michael Telatynski bd0a96f2b2 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

2020-01-06 09:35:59 +00:00

..

structures

Merge pull request #3778 from bit/master

2020-01-02 09:19:02 -07:00

views

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

2020-01-06 09:35:59 +00:00