Merge branch 'master' into development

1 files changed, 1 insertions, 0 deletions

diff --git a/public/emoji/1f1e7-1f1ee.svg b/public/emoji/1f1e7-1f1ee.svg
new file mode 100644
index 000000000..7ea0077c0
--- /dev/null
+++ b/public/emoji/1f1e7-1f1ee.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="m45.2 38.8c1-2 1.6-4.3 1.6-6.8 0-2.4-.6-4.7-1.6-6.8l11-11c-1.9-2.5-4.1-4.8-6.7-6.6l-11 11c-2-1-4.3-1.6-6.7-1.6s-4.7.6-6.7 1.6l-10.8-10.8c-2.5 1.9-4.8 4.1-6.6 6.7l10.7 10.7c-1 2-1.6 4.3-1.6 6.8 0 2.4.6 4.7 1.6 6.8l-10.8 10.7c1.8 2.6 4.1 4.8 6.6 6.7l10.8-10.8c2 1 4.3 1.6 6.7 1.6s4.7-.6 6.7-1.6l11 11c2.6-1.8 4.8-4.1 6.7-6.6l-10.9-11" fill="#fff"/><path d="m31.8 17c2.4 0 4.7.6 6.7 1.6l11-11c-4.9-3.5-11-5.6-17.5-5.6-6.6 0-12.8 2.2-17.7 5.8l10.8 10.8c2-1 4.3-1.6 6.7-1.6" fill="#ed4c5c"/><g fill="#83bf4f"><path d="m46.9 32c0 2.4-.6 4.7-1.6 6.8l11 11c3.6-5 5.8-11.1 5.8-17.7s-2.2-12.8-5.8-17.7l-11 11c1 1.9 1.6 4.2 1.6 6.6"/><path d="m16.8 32c0-2.4.6-4.7 1.6-6.8l-10.8-10.7c-3.5 4.9-5.6 11-5.6 17.5s2.1 12.6 5.6 17.5l10.7-10.7c-.9-2.1-1.5-4.4-1.5-6.8"/></g><g fill="#ed4c5c"><path d="m31.8 47c-2.4 0-4.7-.6-6.7-1.6l-10.8 10.8c5 3.6 11.1 5.8 17.7 5.8 6.5 0 12.6-2.1 17.5-5.6l-11-11c-2 1-4.3 1.6-6.7 1.6"/><path d="m34.8 25h-2l-1-2-1 2h-2l1 2-1 2h2l1 2 1-2h2l-1-2 1-2"/><path d="m28.8 35h-2l-1-2-1 2h-2l1 2-1 2h2l1 2 1-2h2l-1-2 1-2"/><path d="m40.8 35h-2l-1-2-1 2h-2l1 2-1 2h2l1 2 1-2h2l-1-2 1-2"/></g></svg>
\ No newline at end of file