merged conflicts

This commit is contained in:
Jannik Streidl committed 2024-03-07 15:47:15 +01:00
commit 0d127ffef1
41 files changed
+1104 -814

No files matched your search

@@ -149,7 +149,7 @@
<br />
{$i18n.t('You can help us translate the WebUI.')}
<a
class=" text-gray-300 font-medium"
class=" text-gray-300 font-medium underline"
href="https://github.com/open-webui/open-webui/blob/main/docs/CONTRIBUTING.md#-translations-and-internationalization"
target="_blank"
>