Merge branch 'develop' into frontend-switcher-9000

[akkoma] / config / custom_emoji.txt

diff --git a/config/custom_emoji.txt b/config/custom_emoji.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7b2e51265f538ddfabf8ad9c9e90a1b4c3e9c354 100644 (file)
--- a/config/custom_emoji.txt
+++ b/config/custom_emoji.txt
@@ -0,0 +1,2 @@
+hehe, /emoji/hehe.png, Akkoma
+nothehe, /emoji/nothehe.png, Akkoma