Merge remote-tracking branch 'origin/master'

# Conflicts:
#	install/package.json
v1.18.x
Barış Soner Uşaklı 7 years ago
commit 1d5a0eaf13

@ -65,7 +65,7 @@
"mousetrap": "^1.6.1",
"mubsub-nbb": "^1.5.0",
"nconf": "^0.10.0",
"nodebb-plugin-composer-default": "6.0.26",
"nodebb-plugin-composer-default": "6.0.27",
"nodebb-plugin-dbsearch": "2.0.18",
"nodebb-plugin-emoji": "^2.2.2",
"nodebb-plugin-emoji-android": "2.0.0",

Loading…
Cancel
Save