Merge branch 'develop' into 1.10

Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Andy Miller
2020-06-08 12:44:29 -06:00

View File

@@ -3,7 +3,7 @@ $fonts-default: 'Roboto' !default;
$fonts-mono: 'Inconsolata' !default;
$font-definitions: (
Josefin+Slab: 400,
'Josefin Slab': '400',
Roboto: '300,400,500',
Inconsolata: '400,700'
);