MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/59147
Change subject: merge ...................................................................... merge Change-Id: Ie8bab2962a8934485b77892ec30b96d868eac326 --- M RELEASE-NOTES-1.21 M includes/DefaultSettings.php 2 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/47/59147/1 diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index 8d5e6a0..adcf26f 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -122,11 +122,8 @@ quotmarks, order and whitespace in the attribute list). === Bug fixes in 1.21 === -<<<<<<< HEAD (569183 1.20.0rc2) * (bug 46719) Remove link to Special:ActiveUsers from Special:Statistics * (bug 46493) Special:ProtectedPages results in whitepage when a bad title is protected -======= ->>>>>>> BRANCH (04ee0f Merge "Cleared ResourceLoader blob store after update.php fi) * (bug 40617) Installer can now customize the logo in LocalSettings.php * (bug 40353) SpecialDoubleRedirect should support interwiki redirects. * (bug 40352) fixDoubleRedirects.php should support interwiki redirects. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 76e42dc..0edae01 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -63,11 +63,7 @@ * MediaWiki version number * @since 1.2 */ -<<<<<<< HEAD (569183 1.20.0rc2) $wgVersion = '1.21.0rc2'; -======= -$wgVersion = '1.21.0rc1'; ->>>>>>> BRANCH (04ee0f Merge "Cleared ResourceLoader blob store after update.php fi) /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/59147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8bab2962a8934485b77892ec30b96d868eac326 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_21 Gerrit-Owner: MarkAHershberger <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
