aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-12-05 16:22:09 -0500
committerSteve Clay <steve@mrclay.org>2012-12-05 16:22:09 -0500
commitccf7abb4b2b94781f9b67a6cf8798994aa1cca0d (patch)
tree50c21cb20bbf87d41569f21ca438f2957d708888
parentce1cff247caf418af1fab52c5c2182883b7a26d0 (diff)
parentf58bf0eb83d0624ffb6e99d51e0ba65490619eb6 (diff)
downloadelgg-ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d.tar.gz
elgg-ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d.tar.bz2
Merge branch '1811' into 1.8
-rw-r--r--CHANGES.txt7
-rw-r--r--version.php4
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e2f9f4e3f..ca1bdc675 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,10 @@
+Version 1.8.11
+(December 5th, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Bugfix:
+ * Fixed fatal error in group creation form
+
+
Version 1.8.10
(December 4th, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
diff --git a/version.php b/version.php
index 67f8fd480..77d151bb6 100644
--- a/version.php
+++ b/version.php
@@ -11,7 +11,7 @@
// YYYYMMDD = Elgg Date
// XX = Interim incrementer
-$version = 2012111100;
+$version = 2012120500;
// Human-friendly version name
-$release = '1.8.10';
+$release = '1.8.11';