Merge "MessageFormatterFactory"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 30 Aug 2019 22:12:28 +0000 (22:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 30 Aug 2019 22:12:28 +0000 (22:12 +0000)
1  2 
includes/MediaWikiServices.php
includes/ServiceWiring.php

@@@ -17,8 -17,8 +17,9 @@@ use Liuggio\StatsdClient\Factory\Statsd
  use MediaWiki\Block\BlockManager;
  use MediaWiki\Block\BlockRestrictionStore;
  use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 +use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
  use MediaWiki\Http\HttpRequestFactory;
+ use Wikimedia\Message\IMessageFormatterFactory;
  use MediaWiki\Page\MovePageFactory;
  use MediaWiki\Permissions\PermissionManager;
  use MediaWiki\Preferences\PreferencesFactory;
Simple merge