aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt6
-rw-r--r--version.php2
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index ae0cdc333..870c4f57d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,13 @@
Version 1.8.5
-(May 15, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+(May 17, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
Contributing Developers:
* Brett Profitt
+ * Evan Winslow
* Sem
+ * Steve Clay
+ * Jeroen Dalsem
+ * Jerome Bakker
Security Enhancements:
* Fixed possible XSS vulnerability if using a crafted URL.
diff --git a/version.php b/version.php
index c36f4e186..4f028bfd6 100644
--- a/version.php
+++ b/version.php
@@ -14,4 +14,4 @@
$version = 2012041801;
// Human-friendly version name
-$release = '1.8.4';
+$release = '1.8.5';