Merge "Bypass wfGetDB when LoadBalancer is used in scope"

diff --git a/.gitattributes b/.gitattributes
index b306f36..786c09f 100644 (file)
--- 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 1850d67..cc24a80 100644 (file)
--- a/languages/messages/MessagesLzh.php
+++ b/languages/messages/MessagesLzh.php
@@ -76,7 +76,7 @@ $specialPageAliases = [
        'Protectedpages'            => [ '頁錮' ],
        'Randompage'                => [ '清風翻書' ],
        'Randomredirect'            => [ '任渡' ],
-       'Recentchanges'             => [ '近易' ],
+       'Recentchanges'             => [ '監修', '近易' ],
        'Recentchangeslinked'       => [ '援引' ],
        'Search'                    => [ '尋' ],
        'Shortpages'                => [ '短篇' ],