Skip to content

Commit

Permalink
Merge branch 'release/v1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Aug 22, 2017
2 parents 4b1c902 + b2e4c80 commit 23cc040
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion builder/frameworks/mbed
Submodule mbed updated 1 files
+2 −2 mbed.py
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-nordicnrf52.git"
},
"version": "1.2.0",
"version": "1.3.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json"
Expand All @@ -35,7 +35,7 @@
"framework-mbed": {
"type": "framework",
"optional": true,
"version": "~4.146.0"
"version": "~4.149.0"
},
"framework-arduinonordicnrf5": {
"type": "framework",
Expand Down

0 comments on commit 23cc040

Please sign in to comment.