Skip to content

Commit

Permalink
Merge branch 'release/v6.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Dec 30, 2020
2 parents 0aa9316 + 4f71250 commit 1f65360
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion builder/frameworks/arduino
Submodule arduino updated 3 files
+6 −8 adafruit.py
+4 −0 nrf5.py
+3 −3 nrf52-mbedos.py
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-nordicnrf51.git"
},
"version": "6.0.1",
"version": "6.1.0",
"frameworks": {
"arduino": {
"package": "framework-arduinonordicnrf5",
Expand All @@ -43,7 +43,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.600.0"
"version": "~1.700.0"
},
"framework-mbed": {
"type": "framework",
Expand Down

0 comments on commit 1f65360

Please sign in to comment.