Merge branch 'nodeSettings' into 0.17

This commit is contained in:
Nick O'Leary
2017-03-09 20:00:54 +00:00
12 changed files with 197 additions and 12 deletions

View File

@@ -52,6 +52,8 @@ module.exports = {
safeSettings.editorTheme.palette = safeSettings.editorTheme.palette || {};
safeSettings.editorTheme.palette.editable = false;
}
settings.exportNodeSettings(safeSettings);
res.json(safeSettings);
}