From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 21 Jan 2018 01:19:00 +0000 (+0000)
Subject: Merge "Bypass wfGetDB when LoadBalancer is used in scope"
X-Git-Tag: 1.31.0-rc.0~851
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=b4ff03074df8b5be34040137f21354904f60c967;hp=4a790fdd3c0cd26c9d3e2577b6ea28cf1c6d9afc;p=lhc%2Fweb%2Fwiklou.git

Merge "Bypass wfGetDB when LoadBalancer is used in scope"
---

diff --git a/.gitattributes b/.gitattributes
index b306f36886..786c09f0e5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,8 +5,8 @@
 *~ export-ignore
 #*# export-ignore
 .* export-ignore
-package.jso export-ignore
-README.mediawik export-ignore
+package.json export-ignore
+README.mediawiki export-ignore
 Gemfile* export-ignore
 vendor/pear/net_smtp/README.rst export-ignore
 
diff --git a/languages/messages/MessagesLzh.php b/languages/messages/MessagesLzh.php
index 1850d67be1..cc24a8059d 100644
--- a/languages/messages/MessagesLzh.php
+++ b/languages/messages/MessagesLzh.php
@@ -76,7 +76,7 @@ $specialPageAliases = [
 	'Protectedpages'            => [ '頁錮' ],
 	'Randompage'                => [ '清風翻書' ],
 	'Randomredirect'            => [ '任渡' ],
-	'Recentchanges'             => [ '近易' ],
+	'Recentchanges'             => [ '監修', '近易' ],
 	'Recentchangeslinked'       => [ '援引' ],
 	'Search'                    => [ '尋' ],
 	'Shortpages'                => [ '短篇' ],