Merge branch 'master' into refactor/OC-Server-getL10NFactory

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

diff --cc lib/private/Share20/ProviderFactory.php
index 99af6da04a61ba7c8d88a848ccc960274ecb0a2d,e680a82c4aae8c29742c820cb19e02b84ecd108b..fde63a4c3949ec13ee173febd87996a00f907843
--- 1/lib/private/Share20/ProviderFactory.php
--- 2/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@@ -20,8 -20,9 +20,10 @@@ use OCP\Defaults
  use OCP\EventDispatcher\IEventDispatcher;
  use OCP\Federation\ICloudFederationFactory;
  use OCP\Files\IRootFolder;
+ use OCP\Http\Client\IClientService;
  use OCP\IServerContainer;
 +use OCP\L10N\IFactory;
+ use OCP\Mail\IMailer;
  use OCP\Security\IHasher;
  use OCP\Share\IManager;
  use OCP\Share\IProviderFactory;
@@@ -79,9 -80,9 +81,9 @@@ class ProviderFactory implements IProvi
                                $this->serverContainer->getUserManager(),
                                $this->serverContainer->getGroupManager(),
                                $this->serverContainer->get(IRootFolder::class),
-                               $this->serverContainer->getMailer(),
+                               $this->serverContainer->get(IMailer::class),
                                $this->serverContainer->query(Defaults::class),
 -                              $this->serverContainer->getL10NFactory(),
 +                              $this->serverContainer->get(IFactory::class),
                                $this->serverContainer->getURLGenerator(),
                                $this->serverContainer->query(ITimeFactory::class),
                        );

diff --cc lib/private/legacy/OC_Util.php
Simple merge

diff --cc lib/public/Util.php
index 20b4fe9c20d33d46f3694168ad89016f41a2e62f,885e2facc53ee9c486744db3fe7528803ef3b8eb..179d4066c9b9bb9ad6dd79a79a3d11b7fa16d824
--- 1/lib/public/Util.php
--- 2/lib/public/Util.php
+++ b/lib/public/Util.php
@@@ -13,7 -13,7 +13,8 @@@ namespace OCP
  use bantu\IniGetWrapper\IniGetWrapper;
  use OC\AppScriptDependency;
  use OC\AppScriptSort;
 +use OCP\L10N\IFactory;
+ use OCP\Mail\IMailer;
  use OCP\Share\IManager;
  use Psr\Container\ContainerExceptionInterface;
  use Psr\Log\LoggerInterface;