Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2018-10-15 11:37:14 +01:00
3 changed files with 287 additions and 138 deletions

View File

@@ -148,7 +148,7 @@ module.exports = {
// The following property can be used to cause insecure HTTP connections to
// be redirected to HTTPS.
//requireHttps: true
//requireHttps: true,
// The following property can be used to disable the editor. The admin API
// is not affected by this option. To disable both the editor and the admin