insert f69e04d4e9 Merge branch 'master' into 'cleanup' ... # Conflicts: # src/components/common/LocaleSelector.tsx		2021-07-05 10:17:57 +00:00
..
Account.tsx	Merge branch 'master' into cleanup	2021-07-04 21:06:30 -04:00
Appearance.tsx	Merge branch 'master' into 'cleanup'	2021-07-05 10:17:57 +00:00
Experiments.tsx	Fix: Add default for font combo box.	2021-07-05 10:59:48 +01:00
Feedback.tsx	Add permissions / roles settings.	2021-07-01 17:36:34 +01:00
Languages.tsx	Fix: Add default for font combo box.	2021-07-05 10:59:48 +01:00
Notifications.tsx	Merge branch 'master' into 'cleanup'	2021-07-05 10:17:57 +00:00
Panes.module.scss	Settings: Changed to solid icons, fixes	2021-07-04 21:33:05 +02:00
Profile.tsx	remove most uses of `as any` in typescript	2021-07-04 07:09:39 -04:00
Sessions.tsx	remove most uses of `as any` in typescript	2021-07-04 07:09:39 -04:00
Sync.tsx	Fix: Add default for font combo box.	2021-07-05 10:59:48 +01:00