matrix-react-sdk
50a9394c - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4

Commit

5 years ago

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4 Conflicts: src/components/views/room_settings/RoomPublishSetting.tsx

References

#6366 - Move blurhashing into a Worker and use OffscreenCanvas for thumbnailing

Author

t3chguy

Parents

59a1df71

8de4f092

matrix-react-sdk 50a9394c - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4

matrix-react-sdk
50a9394c - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4