From: Marcel Klehr <mklehr@gmx.net>
Date: Tue, 19 Dec 2023 15:14:13 +0000 (+0100)
Subject: Merge branch 'master' into enh/text-processing-provider-with-id
X-Git-Tag: v29.0.0beta1~614^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F41088%2Fhead;p=nextcloud-server.git

Merge branch 'master' into enh/text-processing-provider-with-id
---

53be798a70436b77a512a7ea5045b675280f43bc
diff --cc apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
index 25c815cb140,8a283ba1e70..e2862139e49
--- a/apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
+++ b/apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
@@@ -31,9 -31,9 +31,10 @@@ use OCP\IConfig
  use OCP\IL10N;
  use OCP\Settings\IDelegatedSettings;
  use OCP\SpeechToText\ISpeechToTextManager;
+ use OCP\SpeechToText\ISpeechToTextProviderWithId;
  use OCP\TextProcessing\IManager;
  use OCP\TextProcessing\IProvider;
 +use OCP\TextProcessing\IProviderWithId;
  use OCP\TextProcessing\ITaskType;
  use OCP\Translation\ITranslationManager;
  use Psr\Container\ContainerExceptionInterface;