Merge remote-tracking branch 'upstream/master'

2016-07-13 09:17:32 +01:00
parent 81f74f07b2 299efaf0f2
commit 84a29eec65
11 changed files with 205 additions and 34 deletions
--- a/libs/microbit/pxt.json
+++ b/libs/microbit/pxt.json
@ -36,6 +36,7 @@
    "public": true,
    "dependencies": {},
    "yotta": {
+        "configIsJustDefaults": true,
        "config": {
            "microbit-dal": {
                "bluetooth": {