Merge branch 'master' into next

This commit is contained in:
Lloyd Brookes
2015-11-19 16:15:40 +00:00

View File

@ -202,7 +202,7 @@ $ npm install local-web-server --save-dev
"version": "1.0.0", "version": "1.0.0",
"local-web-server": { "local-web-server": {
"port": 8100, "port": 8100,
"forbid": "\\.json$" "forbid": "*.json"
}, },
"scripts": { "scripts": {
"start": "ws" "start": "ws"