Skip to content

Commit

Permalink
Merge branch 'master' into 0-4-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
jvanbaarsen committed Sep 2, 2016
2 parents f81ca39 + 40468eb commit cfaaecb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.4.2] - 2016-09-02
* Install stable version of Intercity

## [0.4.1] - 2016-08-26
* Fix typo in letsencrypt email template
* Update Letsencrypt acme client to latest version
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.1
0.4.2
2 changes: 1 addition & 1 deletion samples/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:

params:
# Which Git revision should container use?
version: master
version: stable

## These containers are stateless, all data is stored in /shared
volumes:
Expand Down

0 comments on commit cfaaecb

Please sign in to comment.