Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / emoji.txt

diff --git a/config/emoji.txt b/config/emoji.txt
index 79246f239657664b2237033d3df2ef1e85aed429..4b163b88ef102f8f5c0145a33e986f7081759e60 100644 (file)
--- a/config/emoji.txt
+++ b/config/emoji.txt
@@ -28,3 +28,8 @@ f_33b00b, /emoji/f_33b00b.png
 f_33b22b, /emoji/f_33b22b.png
 f_33h, /emoji/f_33h.png
 f_33t, /emoji/f_33t.png
+mayushii, /emoji/mayushii.png
+hahaendme, /emoji/death.png
+stabby, /emoji/stabs.png
+endme, /emoji/end_me.png
+fingerguns, /emoji/fingergun.png