Merge branch 'master' into development

1 files changed, 1 insertions, 0 deletions

diff --git a/public/emoji/1f1f3-1f1e8.svg b/public/emoji/1f1f3-1f1e8.svg
new file mode 100644
index 000000000..7a9113f80
--- /dev/null
+++ b/public/emoji/1f1f3-1f1e8.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="M32,62c13.1,0,24.2-8.3,28.3-20H3.7C7.8,53.7,18.9,62,32,62z" fill="#83bf4f"/><path d="M32,2C18.9,2,7.8,10.4,3.7,22h56.6C56.2,10.4,45.1,2,32,2z" fill="#2a5f9e"/><path d="M60.3,42c1.1-3.1,1.7-6.5,1.7-10s-0.6-6.9-1.7-10H3.7C2.6,25.1,2,28.5,2,32s0.6,6.9,1.7,10H60.3z" fill="#ed4c5c"/><circle cx="24" cy="32" r="17.7" fill="#ffe62e"/><path d="m24 14c-9.9 0-18 8.1-18 18 0 9.9 8.1 18 18 18 9.9 0 18-8.1 18-18 0-9.9-8.1-18-18-18m-17.4 18c0-9.5 7.6-17.2 17-17.4v3.9c-1.1.5-1.9.9-2.1 1.9 0 .1-.1 1.4-.1 1.8 0 0 .2 0 .6-.3.2-.2.8-.3 1.6-.7v2c-1.2.2-2 1.2-2 2.4 0 1.2.9 2.2 2 2.4v.5c-.9 0-1.7-.3-2.4-1.7-.4-.8-1.4-2-1.4-2s.5 1.3.5 2.7c.1 2 1.9 2.2 3.2 2.2v.4h-2.5v.7h2.6v.4c-1.2.1-2 .7-2 1.5 0 .8.9 1.4 2 1.5v.4h-2.6v.4h2.6v.4c-2 .1-3 .9-3.1 2.1-.2 2.5-.7 4.5-.7 4.5s.8-.9 1.6-3.1c.4-1 1.3-1.6 2.2-1.8v.3c-.9.2-1.6 1.4-1.6 2.8 0 1.4.7 2.6 1.6 2.8v.8c-1.2 0-2.4.3-3 .8-.8.7-2.8 2.6-3.6 3.4-6.1-2.7-10.4-8.8-10.4-16m24 16.1c-.7-.8-2.5-2.7-3.6-3.5-.6-.5-1.6-.7-2.6-.8v-.8c.9-.2 1.6-1.4 1.6-2.8 0-1.4-.7-2.6-1.6-2.8v-.3c.9.1 1.8.8 2.2 1.8.9 2.2 1.6 3.1 1.6 3.1s-.5-2-.7-4.5c-.1-1.2-1.1-2-3.1-2.1v-.4h2.6v-.7h-2.6v-.4c1.2-.1 2-.7 2-1.5 0-.8-.9-1.4-2-1.5v-.4h2.6v-.7h-2.6v-.4c1.4 0 3.1-.2 3.2-2.2.1-1.4.5-2.7.5-2.7s-1 1.2-1.4 2c-.7 1.4-1.5 1.7-2.4 1.7v-.5c1.2-.2 2-1.2 2-2.4 0-1.2-.9-2.2-2-2.4v-2.5c.7-.6 1.5-1.5 2.3-2.9.4-.8.2-1.1.2-1.1 0 0 0 .1-.3.3-.7.6-1.5 1-2.2 1.4v-3.5c9.4.2 17 7.9 17 17.4.1 7.3-4.4 13.5-10.7 16.1" fill="#3e4347"/></svg>
\ No newline at end of file