From 1d0657a8ebf5ed7b22b2a3663ba13389dd500f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Nov 2016 11:24:50 +0100
Subject: [PATCH] Preparing release of 1.2.18

---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d72572f4..4da6dfcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # OctoPrint Changelog
 
-## 1.2.18rc1 (2016-11-22)
+## 1.2.18 (2016-11-30)
 
 ### Improvements
 
@@ -16,7 +16,11 @@
   * [#1571](https://github.com/foosel/OctoPrint/issues/1571) - Fix parsing of port number from HTTP Host header for IPv6 addresses
   * Fix issue with settings restriction causing internal settings defaults to be changed.
 
-([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17...1.2.18))
+### More information
+
+  * [Commits](https://github.com/foosel/OctoPrint/compare/1.2.17...1.2.18)
+  * Release Candidates:
+    * [1.2.18rc1](https://github.com/foosel/OctoPrint/releases/tag/1.2.18rc1)
 
 ## 1.2.17 (2016-11-08)