summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-04-15 01:39:20 -0400
committerPaul Arthur <paul.arthur@flowerysong.com>2013-04-15 01:39:20 -0400
commit1113d91bf17c43efcd49fdebd225b4ed4e2ab6fa (patch)
tree1e3697cd6f609314bf5d464eedd687b1c1287ee6
parent81281934edf3902c7c71d72d3dac55a025d0fb35 (diff)
downloadampache-1113d91bf17c43efcd49fdebd225b4ed4e2ab6fa.tar.gz
ampache-1113d91bf17c43efcd49fdebd225b4ed4e2ab6fa.tar.bz2
ampache-1113d91bf17c43efcd49fdebd225b4ed4e2ab6fa.zip
Finalise 3.6-alpha53.6-alpha5
-rwxr-xr-xdocs/CHANGELOG.md4
-rw-r--r--lib/init.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8f093c58..dcb7f57d 100755
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,8 +1,8 @@
CHANGELOG
=========
-3.6-FUTURE
-----------
+3.6-alpha5 *2013-04-15*
+----------------------
- Fixed persistent XSS vulnerability in user self-editing (reported by
Jean-Lou Hau)
- Fixed persistent XSS vulnerabilities in AJAX object editing (reported by
diff --git a/lib/init.php b/lib/init.php
index dc31f744..dd9636a0 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -64,7 +64,7 @@ if ($link) {
}
/** This is the version.... fluf nothing more... **/
-$results['version'] = '3.6-Alpha4-DEV';
+$results['version'] = '3.6-alpha5-DEV';
$results['int_config_version'] = '12';
if ($results['force_ssl']) {