Merge branch 'release/v2.6.0'

platformio · Nov 27, 2017 · f71105f · f71105f
2 parents 271bcdc + b201d2e
commit f71105f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-siliconlabsefm32.git"
   },
-  "version": "2.5.0",
+  "version": "2.6.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -31,7 +31,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~4.152.0"
+      "version": "~4.156.0"
     },
     "tool-openocd": {
       "type": "debugger",