Jorik Schellekens 37b299412f Fix merge conflicts		2020-06-18 15:47:26 +01:00
..
structures	Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options	2020-06-18 15:37:01 +01:00
views	Fix merge conflicts	2020-06-18 15:47:26 +01:00