Merge branch 'master' into development

1 files changed, 1 insertions, 0 deletions

diff --git a/public/emoji/1f3e4.svg b/public/emoji/1f3e4.svg
new file mode 100644
index 000000000..8359ad4f1
--- /dev/null
+++ b/public/emoji/1f3e4.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="m63 60h-62c-.6 0-1 .5-1 1v2c0 .5.4 1 1 1h62c.5 0 1-.5 1-1v-2c0-.5-.5-1-1-1" fill="#b2c1c0"/><path d="m64 17c0 .5-.5 1-1 1h-62c-.6 0-1-.5-1-1v-14c0-.5.4-1 1-1h62c.5 0 1 .5 1 1v14" fill="#428bc1"/><path fill="#62727a" d="m2 18h60v42h-60z"/><g fill="#fff"><path d="m2 20h60v10h-60z"/><path d="m2 32h60v10h-60z"/></g><path fill="#d0d0d0" d="m2 0h60v2h-60z"/><path d="m22.8 6c0 2.8-1.6 5.2-3.9 6.3.6-.9 1-1.9 1-3.1 0-2.9-2.4-5.3-5.3-5.3-2.8 0-5.1 2.2-5.3 4.9-.4-.8-.6-1.7-.6-2.8h-4.7c0 5.5 4.5 10 10 10s10-4.5 10-10c0 0-1.2 0-1.2 0m-8.2-.2c1.9 0 3.5 1.6 3.5 3.5 0 1.9-1.6 3.5-3.5 3.5-1.9 0-3.5-1.6-3.5-3.5 0-2 1.5-3.5 3.5-3.5" fill="#ffe62e"/><g fill="#b4d7ee"><path d="m4.5 22h4v6h-4z"/><path d="m10.5 22h4v6h-4z"/><path d="m19.5 22h4v6h-4z"/><path d="m25.5 22h4v6h-4z"/><path d="m34.5 22h4v6h-4z"/><path d="m40.5 22h4v6h-4z"/><path d="m49.5 22h4v6h-4z"/><path d="m55.5 22h4v6h-4z"/><path d="m4.5 34h4v6h-4z"/><path d="m10.5 34h4v6h-4z"/><path d="m19.5 34h4v6h-4z"/><path d="m25.5 34h4v6h-4z"/><path d="m34.5 34h4v6h-4z"/><path d="m40.5 34h4v6h-4z"/><path d="m49.5 34h4v6h-4z"/><path d="m55.5 34h4v6h-4z"/></g><path fill="#ffe62e" d="m21 44v16h2v-12h18v12h2v-16z"/><g fill="#b4d7ee"><path d="m27 48h4v12h-4z"/><path d="m33 48h4v12h-4z"/></g><g fill="#fff"><path d="m31 48h2v12h-2z"/><path d="m37 48h2v12h-2z"/><path d="m25 48h2v12h-2z"/><path d="m26 53h12v2h-12z"/><path d="m43 48h16v10h-16z"/><path d="m5 48h16v10h-16z"/></g><g fill="#b4d7ee"><path d="m43 50h14v6h-14z"/><path d="m7 50h14v6h-14z"/></g><g fill="#fff"><path d="m13 49h2v8h-2z"/><path d="m49 49h2v8h-2z"/></g><g fill="#ffe62e"><path d="m28 5.3c.6-.1 1.5-.2 2.8-.2 1.3 0 2.2.3 2.8.8.6.5 1 1.3 1 2.2s-.3 1.8-.8 2.3c-.7.7-1.7 1-2.9 1-.3 0-.5 0-.7 0v3.5h-2v-9.6zm2 4.4c.2 0 .4.1.7.1 1.1 0 1.8-.6 1.8-1.6 0-.9-.6-1.4-1.6-1.4-.4 0-.7 0-.8.1v2.8z"/><path d="m44.4 9.9c0 3.2-1.8 5.1-4.4 5.1-2.7 0-4.2-2.2-4.2-4.9 0-2.9 1.7-5.1 4.4-5.1 2.7 0 4.2 2.2 4.2 4.9m-6.5.1c0 1.9.8 3.2 2.2 3.2 1.4 0 2.2-1.4 2.2-3.3 0-1.7-.8-3.2-2.2-3.2-1.4 0-2.2 1.4-2.2 3.3"/><path d="m46.2 12.6c.6.3 1.4.6 2.3.6.9 0 1.4-.4 1.4-1 0-.6-.4-.9-1.5-1.4-1.5-.6-2.5-1.5-2.5-2.9 0-1.7 1.3-2.9 3.4-2.9 1 0 1.8.2 2.3.5l-.5 1.8c-.4-.2-1-.5-1.9-.5-.9 0-1.3.4-1.3.9 0 .6.5.9 1.7 1.4 1.6.6 2.4 1.5 2.4 2.9 0 1.6-1.2 3-3.6 3-1 0-2.1-.3-2.6-.6l.4-1.8"/><path d="M55.5,7h-2.4V5.2H60V7h-2.5v7.8h-2V7z"/></g></svg>
\ No newline at end of file