Michael Telatynski 661701f7ca Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes ...

 Conflicts:

	src/components/views/elements/TagTile.js

2019-12-23 11:00:42 +00:00

..

strings

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

2019-12-23 11:00:42 +00:00