Prepare for 1.8.18 release

diff --git a/CHANGES.txt b/CHANGES.txt
index 819378e12fd0467cdcba30ed2ded39d386ce2442..f6974a3aebb9e2487a194a3b7b4083c7a6032efb 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+Version 1.8.18
+(January 11, 2014 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Juho Jaakkola
+   * Steve Clay
+
+  Bugfixes:
+   * Fixes notify_user() broken in 1.8.17
+
+
 Version 1.8.17
 (January 1, 2014 from https://github.com/Elgg/Elgg/tree/1.8)
   Contributing Developers:

diff --git a/version.php b/version.php
index c29b44c0728fe6b8873a9f3eb8e3d3b03da09fc6..a7a4776a41911aae28e3fc828fd9e87307ea0327 100644 (file)
--- a/version.php
+++ b/version.php
@@ -11,7 +11,7 @@
 
 // YYYYMMDD = Elgg Date
 // XX = Interim incrementer
-$version = 2014010100;
+$version = 2014110100;
 
 // Human-friendly version name
-$release = '1.8.17';
+$release = '1.8.18';