Merge branch 'master' into development

1 files changed, 1 insertions, 0 deletions

diff --git a/public/emoji/262e.svg b/public/emoji/262e.svg
new file mode 100644
index 000000000..01a035a55
--- /dev/null
+++ b/public/emoji/262e.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="m9.7 12h8.5c3.2-2.2 7-3.7 11.1-4.2v4.2h5.6v-4.2c4.1.5 7.8 2 11.1 4.2h8.5c-5.7-6.1-13.6-10-22.5-10-8.9 0-16.8 3.9-22.3 10" fill="#66b0dd"/><g fill="#c7e755"><path d="m54.2 22h6.1c-1.3-3.7-3.4-7.1-5.9-10h-8.5c3.6 2.5 6.5 6 8.3 10"/><path d="m18.1 12h-8.4c-2.6 2.9-4.7 6.3-6 10h6.1c1.8-4 4.7-7.5 8.3-10"/><path d="m29.2 12h5.6v10h-5.6z"/></g><g fill="#ffe75a"><path d="m29.2 30.6l-1.4 1.4h8.4l-1.4-1.4v-8.6h-5.6z"/><path d="m56.4 32h5.6c0-3.5-.6-6.9-1.7-10h-6.1c1.4 3.1 2.2 6.4 2.2 10"/><path d="M3.7,22C2.6,25.1,2,28.5,2,32h5.6c0-3.6,0.8-6.9,2.2-10H3.7z"/></g><g fill="#eda454"><path d="m56.4 32c0 3.6-.8 6.9-2.2 10h6.1c1.1-3.1 1.7-6.5 1.7-10h-5.6"/><path d="m17.8 42h7.9l3.5-3.4v3.4h5.6v-3.4l3.5 3.4h7.9l-10-10h-8.4z"/><path d="m9.8 42c-1.4-3.1-2.2-6.4-2.2-10h-5.6c0 3.5.6 6.9 1.7 10h6.1"/></g><g fill="#ed5181"><path d="m29.2 42h5.6v10h-5.6z"/><path d="m46.2 42h-8l9 9c-.4.4-.9.7-1.3 1h8.4c2.6-2.9 4.6-6.3 5.9-10h-6.1c-.8 1.8-1.8 3.5-3 5l-4.9-5"/><path d="m25.7 42h-8l-5 5c-1.2-1.5-2.2-3.2-3-5h-6c1.3 3.7 3.4 7.1 5.9 10h8.4c-.5-.3-.9-.7-1.3-1l9-9"/></g><path d="m54.3 52h-8.4c-3.2 2.2-7 3.7-11.1 4.2v-4.2h-5.6v4.2c-4.1-.5-7.9-2-11.1-4.2h-8.4c5.5 6.1 13.5 10 22.3 10 8.9 0 16.8-3.9 22.3-10" fill="#a374b8"/></svg>
\ No newline at end of file