Skip to content

Commit

Permalink
Merge pull request #805 from mesosphere/revert-804-release/1.2.0
Browse files Browse the repository at this point in the history
Revert "Raise version to 1.2.0 in changelog"
  • Loading branch information
Poltergeist committed May 11, 2017
2 parents ee77f9b + 7f23b15 commit f0af3e8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
## 1.2.0 - 2017-05-11
### Fixed
- Fix Network handling and support networks in Marathon 1.5.0

## 1.1.7 - 2017-02-14
### Fixed
- MARATHON-1339: Handling secrets in environment variables
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "marathon-ui",
"version": "1.2.0",
"version": "1.1.8",
"engines": {
"node": "5.4.1"
},
Expand Down

0 comments on commit f0af3e8

Please sign in to comment.