Michael Telatynski a784e29622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174 ... Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts		2020-09-16 16:09:08 +01:00
..
structures	UI Feature Flag: Disable feedback button	2020-09-16 10:59:14 +01:00
views	Merge pull request #5220 from matrix-org/t3chguy/fix/15202	2020-09-16 16:04:15 +01:00