Merge remote-tracking branch 'origin/master' into fix-vendors

This commit is contained in:
Julian Lam
2016-04-06 21:43:19 -04:00
2 changed files with 3 additions and 3 deletions

View File

@@ -441,7 +441,7 @@ function enableDefaultPlugins(next) {
'nodebb-rewards-essentials',
'nodebb-plugin-soundpack-default',
'nodebb-plugin-emoji-extended',
'nodebb-plugin-emoji-apple'
'nodebb-plugin-emoji-one'
],
customDefaults = nconf.get('defaultPlugins');