Skip to content

Commit

Permalink
Auto-merge for PR #781 via VersionBot
Browse files Browse the repository at this point in the history
Switch back to upstream global-tunnel-ng
  • Loading branch information
resin-io-versionbot[bot] authored Feb 5, 2018
2 parents b960655 + 5c0ba5d commit 0fd1f04
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).

## v6.12.9 - 2018-02-05

* Switch back to upstream global-tunnel-ng #781 [Alexis Svinartchouk]

## v6.12.8 - 2018-02-03

* Fix uuid params being parsed a numbers #774 [Thodoris Greasidis]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "resin-cli",
"version": "6.12.8",
"version": "6.12.9",
"description": "The official resin.io CLI tool",
"main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli",
Expand Down Expand Up @@ -100,7 +100,7 @@
"ejs": "^2.5.7",
"etcher-image-write": "^9.0.3",
"express": "^4.13.3",
"global-tunnel-ng": "github:zvin/global-tunnel#dont-proxy-connections-to-file-sockets",
"global-tunnel-ng": "^2.1.1",
"hasbin": "^1.2.3",
"inquirer": "^3.1.1",
"is-root": "^1.0.0",
Expand Down

0 comments on commit 0fd1f04

Please sign in to comment.