rampage

Commit

6 years ago

Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage Conflicts: src/components/views/elements/AccessibleTooltipButton.tsx

References

#5002 - Post-launch Element Web polish

Author

t3chguy

Parents

ebb9c4e8

9b13ef14

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

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