瀏覽代碼

Merge branch 'release' into merge_release_v1.0.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Michael Crosby 11 年之前
父節點
當前提交
07e9ac9ffe
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 5 0
      CHANGELOG.md
  2. 1 1
      VERSION

+ 5 - 0
CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 # Changelog
 
 
+## 1.0.0 (2014-06-09)
+
+#### Notable features since 0.12.0
+* Production support
+
 ## 0.12.0 (2014-06-05)
 ## 0.12.0 (2014-06-05)
 
 
 #### Notable features since 0.11.0
 #### Notable features since 0.11.0

+ 1 - 1
VERSION

@@ -1 +1 @@
-0.12.0-dev
+1.0.0