Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-03 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2016-04-06 21:43:19 -04:00
parent 930c2b7472 075df88600
commit 7bc4ea18f4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -48,8 +48,8 @@
"nconf": "~0.8.2",
"nodebb-plugin-composer-default": "3.0.19",
"nodebb-plugin-dbsearch": "1.0.1",
"nodebb-plugin-emoji-apple": "1.0.3",
"nodebb-plugin-emoji-extended": "1.0.5",
"nodebb-plugin-emoji-one": "1.1.0",
"nodebb-plugin-emoji-extended": "1.1.0",
"nodebb-plugin-markdown": "5.0.1",
"nodebb-plugin-mentions": "1.0.21",
"nodebb-plugin-soundpack-default": "0.1.6",

2
src/install.js
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');