diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-18 19:12:44 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-18 19:12:44 -0600 |
| commit | 4bb2aeca1d198391ca856aa16c40b8559c68daec (patch) | |
| tree | 72371f0fd947bcec45562ccfa1164f3349e4e4e6 /includes/DefaultSettings.php | |
| parent | fa93eabd8fdebb47d623537afbd5e6df1271112a (diff) | |
| parent | cacc939b34e315b85e2d72997811eb6677996cc1 (diff) | |
Merge branch 'archwiki'
Conflicts:
extensions/ArchInterWiki.sql
extensions/FluxBBAuthPlugin.php
Diffstat (limited to 'includes/DefaultSettings.php')
| -rw-r--r-- | includes/DefaultSettings.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6abc2b10..710605ad 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.5'; +$wgVersion = '1.20.6'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; |