insert c4b9950514 Merge branch 'master' into 'cleanup' ... # Conflicts: # src/components/common/LocaleSelector.tsx		2021-07-05 10:17:57 +00:00
..
assets	Re-organise assets to be closer to their respective uses.	2021-06-20 11:05:12 +01:00
channel	Add permissions / roles settings.	2021-07-01 17:36:34 +01:00
panes	Merge branch 'master' into 'cleanup'	2021-07-05 10:17:57 +00:00
server	Fix: Add default for font combo box.	2021-07-05 10:59:48 +01:00
ChannelSettings.tsx	Add permissions / roles settings.	2021-07-01 17:36:34 +01:00
GenericSettings.tsx	Temporary blocked messages solution.	2021-07-03 14:45:08 +01:00
ServerSettings.tsx	Fix i18n for server settings.	2021-07-02 22:08:03 +01:00
Settings.module.scss	Feature: Font selector and ligature toggle.	2021-07-04 17:56:18 +01:00
Settings.tsx	Settings: Changed to solid icons, fixes	2021-07-04 21:33:05 +02:00