diff options
| author | Chad Horohoe <chadh@wikimedia.org> | 2012-12-10 13:33:12 -0500 |
|---|---|---|
| committer | Chad Horohoe <chadh@wikimedia.org> | 2012-12-10 13:33:12 -0500 |
| commit | b92b9b62c0c93d16c93541ea1cd5afa5d60eef52 (patch) | |
| tree | 05450c98d2e7b41fe880afb66f8ca9e09e513f54 | |
| parent | acddbc862afceead7cd3cce1dc1cc55c265e0ca1 (diff) | |
| download | mediawikicore-b92b9b62c0c93d16c93541ea1cd5afa5d60eef52.tar.gz mediawikicore-b92b9b62c0c93d16c93541ea1cd5afa5d60eef52.zip | |
Applied patches to new WMF 1.21wmf6 branch
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | includes/DefaultSettings.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitreview b/.gitreview index 0ec44b8359a7..435b8fd2b914 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/core.git -defaultbranch=master +defaultbranch=wmf/1.21wmf6 defaultrebase=0 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c2f7ea6d0870..e90a065e410c 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -59,7 +59,7 @@ if( !defined( 'MEDIAWIKI' ) ) { $wgConf = new SiteConfiguration; /** MediaWiki version number */ -$wgVersion = '1.21alpha'; +$wgVersion = '1.21wmf6'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; |