resolved the conflicts 😍

This commit is contained in:
Jannik Streidl
2024-04-30 11:33:05 +02:00
50 changed files with 1339 additions and 352 deletions
+1 -1
View File
@@ -345,7 +345,7 @@
// await chats.set(await getChatListByTagName(localStorage.token, tag.name));
}}
>
<div class=" text-xs font-medium self-center line-clamp-1">{$i18n.t('add tags')}</div>
<div class=" text-xs font-medium self-center line-clamp-1">add tags</div>
</button> -->
<button
+1 -1
View File
@@ -145,7 +145,7 @@
</div>
<div class=" mt-1 text-gray-400">
{dayjs(chat.chat.timestamp).format('MMMM D, YYYY')}
{dayjs(chat.chat.timestamp).format($i18n.t('MMMM DD, YYYY'))}
</div>
</div>