From: sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Thu, 16 May 2019 19:24:29 +0000 (+0100)
Subject: add emojo
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=7f40b66d5126c10a9c23ebf674d863dfd6ed054e;hp=-c;p=akkoma

add emojo
---

7f40b66d5126c10a9c23ebf674d863dfd6ed054e
diff --git a/config/emoji.txt b/config/emoji.txt
index 16e8ee24f..4b163b88e 100644
--- a/config/emoji.txt
+++ b/config/emoji.txt
@@ -29,3 +29,7 @@ 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
diff --git a/priv/static/emoji/death.png b/priv/static/emoji/death.png
new file mode 100644
index 000000000..9da259858
Binary files /dev/null and b/priv/static/emoji/death.png differ
diff --git a/priv/static/emoji/end_me.png b/priv/static/emoji/end_me.png
new file mode 100644
index 000000000..712abe3f4
Binary files /dev/null and b/priv/static/emoji/end_me.png differ
diff --git a/priv/static/emoji/fingergun.png b/priv/static/emoji/fingergun.png
new file mode 100644
index 000000000..4b310fa81
Binary files /dev/null and b/priv/static/emoji/fingergun.png differ
diff --git a/priv/static/emoji/stabs.png b/priv/static/emoji/stabs.png
new file mode 100644
index 000000000..903266148
Binary files /dev/null and b/priv/static/emoji/stabs.png differ