Merge "Upstream EasyDeflate library from VisualEditor"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 26 Jul 2018 15:06:41 +0000 (15:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jul 2018 15:06:41 +0000 (15:06 +0000)
1  2 
autoload.php
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

diff --cc autoload.php
@@@ -432,8 -427,8 +432,9 @@@ $wgAutoloadLocalClasses = 
        'DumpRenderer' => __DIR__ . '/maintenance/renderDump.php',
        'DumpRev' => __DIR__ . '/maintenance/storage/dumpRev.php',
        'DumpStringOutput' => __DIR__ . '/includes/export/DumpStringOutput.php',
 +      'DumpUploads' => __DIR__ . '/maintenance/dumpUploads.php',
        'DuplicateJob' => __DIR__ . '/includes/jobqueue/jobs/DuplicateJob.php',
+       'EasyDeflate' => __DIR__ . '/includes/libs/EasyDeflate.php',
        'EditAction' => __DIR__ . '/includes/actions/EditAction.php',
        'EditCLI' => __DIR__ . '/maintenance/edit.php',
        'EditPage' => __DIR__ . '/includes/EditPage.php',
Simple merge
Simple merge
Simple merge