Merge pull request #4500 from frissdiegurke/master

Emoji update
9 years ago · 075df88600
parent bf73c0de5f 5023935baf
commit 075df88600
2 changed files with 3 additions and 3 deletions
--- a/package.json
+++ b/package.json
@ -46,8 +46,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",
--- a/src/install.js
+++ b/src/install.js
@ -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');