Skip to content

Commit

Permalink
Merge remote-tracking branch 'jbrown123/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
noopkat committed Feb 17, 2017
2 parents 7296da2 + 0924a9a commit 8c49683
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"dependencies": {
"async": "^2.1.2",
"awty": "^0.1.0",
"browser-serialport": "git://github.com/noopkat/browser-serialport#api-updates",
"browser-serialport": "https://github.com/noopkat/browser-serialport#api-updates",
"chip.avr.avr109": "^1.1.0",
"colors": "^1.1.2",
"graceful-fs": "^4.1.2",
"intel-hex": "^0.1.1",
"minimist": "^1.2.0",
"serialport": "^4.0.1",
"stk500": "git://github.com/noopkat/js-stk500v1#avrgirl",
"stk500": "https://github.com/noopkat/js-stk500v1#avrgirl",
"stk500-v2": "^1.0.2"
},
"devDependencies": {
Expand Down

0 comments on commit 8c49683

Please sign in to comment.