Merge branch 'release' into merge_release_v1.0.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-09 07:14:40 -07:00 · 2014-06-09 07:14:40 -07:00 · 07e9ac9ffe
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,10 @@
 # Changelog

+## 1.0.0 (2014-06-09)
+
+#### Notable features since 0.12.0
+* Production support
+
 ## 0.12.0 (2014-06-05)

 #### Notable features since 0.11.0
--- a/2
+++ b/2
@ -1 +1 @@
-0.12.0-dev
+1.0.0