58 commits

Author	SHA1	Message	Date
Travis Ralston	92e30f0607	Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev	2021-05-11 10:13:21 -06:00
Michael Telatynski	bf4c8f048f	Add feedback mechanism for beta features	2021-05-11 15:58:19 +01:00
Michael Telatynski	cb13200c2d	last minute copy tweak	2021-05-07 11:56:41 +01:00
Michael Telatynski	90538c95aa	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-06 08:05:14 +01:00
Michael Telatynski	2435332d37	fix beta disabled behaviour	2021-04-30 12:42:16 +01:00
Michael Telatynski	158a0f90cb	Further design iteration	2021-04-29 22:02:18 +01:00
Michael Telatynski	279654cc9e	Design iterations based on PR feedback	2021-04-29 16:08:59 +01:00
Michael Telatynski	1802adb4d2	Iterate styling and decoration for the beta prompts	2021-04-28 22:47:08 +01:00

Renamed from src/settings/Settings.ts (Browse further)