Merge branch '0.14.0'

This commit is contained in:
Nick O'Leary
2016-06-17 21:30:09 +01:00
167 changed files with 6903 additions and 4341 deletions

View File

@@ -63,7 +63,6 @@ module.exports = {
}
themeSettings = null;
theme = settings.editorTheme;
},
app: function() {