Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391436 )
Change subject: Merge branch 'REL1_27' into fundraising/REL1_27 ...................................................................... Merge branch 'REL1_27' into fundraising/REL1_27 Get it all square after the security release Change-Id: If351605e0d9f5fcf759bd4ae053b864b249e966c --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/391436/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 82a5140..5b47077 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -75,11 +75,7 @@ * MediaWiki version number * @since 1.2 */ -<<<<<<< HEAD (8bdce4 Update vendor submodule for .htaccess) -$wgVersion = '1.27.3-fundraising'; -======= -$wgVersion = '1.27.4'; ->>>>>>> BRANCH (a80647 Bump 1.27.4) +$wgVersion = '1.27.4-fundraising'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/391436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If351605e0d9f5fcf759bd4ae053b864b249e966c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg <ej...@ejegg.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
