Merge branch 'master' into tabs

This commit is contained in:
Nicholas O'Leary 2013-10-21 13:13:08 +01:00
commit ce4b5ee237
1 changed files with 2 additions and 2 deletions

View File

@ -13,11 +13,11 @@
"start": "node red.js" "start": "node red.js"
}, },
"contributors": [ "contributors": [
{"name": "Nick O'Leary"} {"name": "Nick O'Leary"},
{"name": "Dave Conway-Jones"} {"name": "Dave Conway-Jones"}
], ],
"keywords": [ "keywords": [
"editor", "messaging", "iot", "m2m", "pi", "arduino", "beaglebone", "ibm "editor", "messaging", "iot", "m2m", "pi", "arduino", "beaglebone", "ibm", "flow"
], ],
"dependencies": { "dependencies": {
"express": "3.x", "express": "3.x",