Merge remote-tracking branch 'origin/master'

This commit is contained in:
Josh Johnson 2016-09-06 18:47:26 +01:00
commit ca3e4af079

View file

@ -61,5 +61,16 @@
"dependencies": {
"redux": "^3.3.1",
"fuse.js": "^2.2.0"
}
},
"npmName": "choices.js",
"npmFileMap": [
{
"basePath": "assets",
"files": [
"scripts/dist/*",
"styles/css/*",
"icons/*"
]
}
]
}