Merge remote-tracking branch 'origin/master'

# Conflicts:
#	install/package.json
This commit is contained in:
Baris Usakli
2018-01-17 14:06:24 -05:00

View File

@@ -67,11 +67,14 @@
"nodebb-plugin-mentions": "2.2.2",
"nodebb-plugin-soundpack-default": "1.0.0",
"nodebb-plugin-spam-be-gone": "0.5.1",
"nodebb-rewards-essentials": "0.0.10",
"nodebb-rewards-essentials": "0.0.11",
"nodebb-theme-lavender": "5.0.0",
"nodebb-theme-persona": "7.2.17",
"nodebb-theme-slick": "1.1.2",
"nodebb-theme-slick": "1.1.4",
"nodebb-theme-vanilla": "8.1.8",
"nodebb-theme-persona": "7.2.16",
"nodebb-theme-slick": "1.1.4",
"nodebb-theme-vanilla": "8.1.7",
"nodebb-widget-essentials": "4.0.1",
"nodemailer": "4.4.1",
"passport": "^0.4.0",