Merge branch 'master' of github.com:Microsoft/kindscript-microbit

Conflicts:
	libs/microbit/kind.json
This commit is contained in:
Michal Moskal 2016-03-28 13:19:06 -07:00
commit 995d81efe0

View File

@ -22,7 +22,7 @@
"id": "microbit", "id": "microbit",
"name": "BBC micro:bit", "name": "BBC micro:bit",
"title": "JavaScript for BBC micro:bit", "title": "JavaScript for BBC micro:bit",
"cloud": true, "cloud": false,
"blocksprj": { "blocksprj": {
"id": "blocksprj", "id": "blocksprj",
"config": { "config": {