summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2013-04-30 09:59:26 -0700
committerGerrit Code Review <gerrit@wikimedia.org>2013-05-01 17:50:31 +0000
commit375d04b02cfb9f1e4a1ecc5193f95010c76fbf0d (patch)
tree6808348990b7b429daef9a7d7bfa20ea772d5fa4
parentae02ef0b881a7c0c6bd5c7d766de47e0fe5b4fac (diff)
Updated release notes and version number1.20.5
Change-Id: I8003f2a8a9d71eccf403d9d162ce9f3e583f0a46
-rw-r--r--RELEASE-NOTES-1.2010
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 9 insertions, 3 deletions
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 4842f3a09ac3..80b200d679b5 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -5,11 +5,17 @@ setting since version 1.2.0. If you have it on, turn it '''off''' if you can.
== MediaWiki 1.20.5 ==
-This is not a release yet!
+This is a security and maintenance release of the MediaWiki 1.20 branch.
-=== Changes since 1.20.5 ===
+=== Changes since 1.20.4 ===
+* (bug 46590) Add hook AbortChangePassword to Special:ChangePassword
+* (bug 47304) SECURITY: Check SVG xml encoding against whitelist
+* Localisation updates from http://translatewiki.net.
+* mwdocgen.php: Implement --version option.
+* Remove svnstat stuff used in Doxygen generation
* (bug 43594) Correctly supress warnings that were missed after the upstream
PHP change to E_STRICT being included in E_ALL.
+* jshint: Allow global mw to be set in mediawiki.js
== MediaWiki 1.20.4 ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ed566b3bd450..6abc2b10daed 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if( !defined( 'MEDIAWIKI' ) ) {
$wgConf = new SiteConfiguration;
/** MediaWiki version number */
-$wgVersion = '1.20.4';
+$wgVersion = '1.20.5';
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';