add emojo
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 16 May 2019 19:24:29 +0000 (20:24 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 16 May 2019 19:24:29 +0000 (20:24 +0100)
config/emoji.txt
priv/static/emoji/death.png [new file with mode: 0644]
priv/static/emoji/end_me.png [new file with mode: 0644]
priv/static/emoji/fingergun.png [new file with mode: 0644]
priv/static/emoji/stabs.png [new file with mode: 0644]

index 16e8ee24fbf76a96076c1db9c4ce52f2c7018472..4b163b88ef102f8f5c0145a33e986f7081759e60 100644 (file)
@@ -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 (file)
index 0000000..9da2598
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 (file)
index 0000000..712abe3
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 (file)
index 0000000..4b310fa
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 (file)
index 0000000..9032661
Binary files /dev/null and b/priv/static/emoji/stabs.png differ