chore: merge branch 'ui/glass-header'

2026-03-07 09:25:27 +00:00 · 2022-01-02 23:48:19 +00:00
parent f3c3017e0c 7c120685d4
commit c26ef4c2b2
45 changed files with 863 additions and 396 deletions
--- a/src/assets/emojis.ts
+++ b/src/assets/emojis.ts
@@ -673,6 +673,7 @@ export const emojiDictionary = {
    mandarin: "🍊",
    lemon: "🍋",
    banana: "🍌",
+    nanner: "🍌",
    pineapple: "🍍",
    mango: "🥭",
    apple: "🍎",
@@ -876,6 +877,7 @@ export const emojiDictionary = {
    train: "🚋",
    bus: "🚌",
    oncoming_bus: "🚍",
+    trolley: "🚎",
    trolleybus: "🚎",
    minibus: "🚐",
    ambulance: "🚑",