Merge pull request #926 from wagnert/master

Switch to version 1.1.0
appserver-io · Nov 9, 2015 · 21e581f · 21e581f
2 parents d7c82f1 + cbaaec7
commit 21e581f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Version 1.1.0
+
+## Bugfixes
+
+* None
+
+## Features
+
+* None
+
 # Version 1.1.0-rc1
 
 ## Bugfixes

diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 #--------------------------------------------------------------------------------
 
 # ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.0-rc1
+release.version = 1.1.0
 release.name = Iron Knight
 
 # ---- PHPCPD Settings ----------------------------------------------------------