Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2021-07-16 08:53:35 +01:00
4 changed files with 8 additions and 6 deletions

View File

@@ -244,7 +244,7 @@ module.exports = {
)
themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || [])
theme.page = theme.page || {_:{}}
theme.page._.scripts = cssFiles.concat(theme.page._.scripts || [])
theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
}
}
activeThemeInitialised = true;