matrix-react-sdk

1f337b28 - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
Conflicts:
src/ContentMessages.tsx
src/components/structures/UploadBar.tsx
src/components/views/messages/MImageBody.js
src/components/views/messages/MStickerBody.js
src/components/views/messages/MVideoBody.tsx