Merge branch 'master' into development

1 files changed, 1 insertions, 0 deletions

diff --git a/public/emoji/1f468-1f469-1f467-1f466.svg b/public/emoji/1f468-1f469-1f467-1f466.svg
new file mode 100644
index 000000000..0ab0a6b2b
--- /dev/null
+++ b/public/emoji/1f468-1f469-1f467-1f466.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="M17,2C7.3,2,2,8.3,2,16.7v18.5h30V16.7c0-12.4-8.1-12.2-8.1-12.2S23.3,2,17,2z" fill="#ffb300"/><path d="m32 34.8v27.2h30v-27.2c0-5.8-30-5.8-30 0" fill="#01579b"/><path d="M2,34.8V62h30V34.8C32,29,2,29,2,34.8z" fill="#c2185b"/><path d="m6.4 23.6c0 0-2.2-.6-2.2-3.9 0-2.6 1.7-3.1 1.7-3.1 6 0 15.8-7.8 15.8-7.8s3.7 6.9 7.3 7.8c0 0 1.7.3 1.7 3.1 0 3.3-2.3 3.9-2.3 3.9 0 5-6.8 10-11 10-4 0-11-5-11-10" fill="#ffdd67"/><g fill="#937237"><circle cx="12.1" cy="20.3" r="2.2"/><circle cx="22.9" cy="20.3" r="2.2"/><path d="m21.1 27.1c-2.3 1.8-4.9 1.8-7.2 0-.3-.2-.5.2-.3.5.7 1.3 2.1 2.4 3.9 2.4s3.2-1.1 3.9-2.4c.2-.3 0-.7-.3-.5"/></g><path d="m31.9 17.3l1.5 2.8h26.2l1.1-2.9c0-10.6-2.5-15-14.1-15.1-11.8-.2-14.7 4.5-14.7 15.2" fill="#ffb300"/><path d="m59.7 17.1c-.1.6-.2 1.2-.4 1.5-.3.6-.9.9-.9.9s.2-1.2.1-2.8c-.7-9.7-1.2-5.1-11.9-5.1-10.7 0-11.3-4.7-11.9 5-.1 1.7.1 2.8.1 2.8s-.6-.3-.9-.9c-.2-.3-.3-.9-.4-1.5-1-.3-2.3 0-2.3 2.9 0 1.8.7 3.3 2.9 3.5.8 6.1 8.9 10.1 12.6 10.1 3.6 0 11.8-4.1 12.6-10.1 2.2-.2 2.9-1.7 2.9-3.5-.2-2.8-1.5-3-2.5-2.8" fill="#ffdd67"/><g fill="#937237"><circle cx="41" cy="20.3" r="2.2"/><circle cx="52" cy="20.3" r="2.2"/><path d="m50.1 27.1c-2.3 1.8-4.9 1.8-7.2 0-.3-.2-.5.2-.3.5.7 1.3 2.1 2.4 3.9 2.4s3.2-1.1 3.9-2.4c.2-.3 0-.7-.3-.5"/></g><path d="m57 62h-25c0-8.4 25-8.4 25 0" fill="#29b6f6"/><path d="m44.5 36c-6.7 0-10.9 3.8-10.9 8.5v3.2c0 3.7 2.9 3.7 2.9 3.7h16.4c0 0 2.5 0 2.5-3.7 0-1.7 0-3.2 0-3.2 0-4.7-4.4-8.5-10.9-8.5" fill="#ffb300"/><path d="m34.6 48.5l.4-4.5c0-2.9 4.5-.6 9.5-.6s9.5-2.3 9.5.6l.4 4.5c2.2 0 2.2 3.5 0 3.5 0 4.4-5.9 7-9.9 7-4 0-9.9-2.6-9.9-7-2.1 0-2.1-3.5 0-3.5" fill="#ffdd67"/><g fill="#937237"><circle cx="39.7" cy="49.8" r="1.8"/><circle cx="49.3" cy="49.8" r="1.8"/><path d="m41.4 54.4c2 1.5 4.3 1.5 6.3 0 .2-.2.5.1.3.4-.6 1.1-1.9 2-3.4 2-1.6 0-2.8-1-3.4-2-.3-.3-.1-.6.2-.4"/></g><path d="m30 51.6h.9v-5.7c0-5.5-4.4-9.8-11.6-9.8-6.9 0-11.6 4.4-11.6 9.8 0 1.1 0 5.7 0 5.7h1.2c-1.5 1.7-2.7 5.4-1.4 7.7.5.9 5.9 4.2 6.4-1.6h11.1c.5 5.8 5.9 2.5 6.4 1.6 1.3-2.3.1-6-1.4-7.7" fill="#ffb300"/><g fill="#ff81ab"><path d="m19.3 37.8c-6.2 0-10.4 3.2-10.4 7.2 0 0 0 .5 0 1.2 0-4 4.2-7.2 10.4-7.2 6.4 0 10.4 3.2 10.4 7.2v-1.2c0-4-3.9-7.2-10.4-7.2"/><path d="m7 62h25c0-8.4-25-8.4-25 0"/></g><path d="m29.3 52.8c0 0 1.8.3 1.8-1.7 0-1.6-1.8-1.5-1.8-1.5v-1.8c0 0-13.5-.6-16.6-5.7.8 5.1-3.3 7.4-3.3 7.4s-1.8-.2-1.8 1.5c0 2 1.8 1.7 1.8 1.7 0 3 5.3 6.2 10.2 6.2 4.4.1 9.7-2.6 9.7-6.1" fill="#ffdd67"/><g fill="#937237"><path d="m25.8 49.8c0 1-.8 1.8-1.8 1.8-1 0-1.8-.8-1.8-1.8s.9-1.8 1.8-1.8c1 0 1.8.8 1.8 1.8"/><circle cx="14.9" cy="49.8" r="1.8"/><path d="m22.6 54.4c-2 1.5-4.3 1.5-6.3 0-.2-.2-.5.1-.3.4.6 1.1 1.9 2 3.4 2 1.6 0 2.8-1 3.4-2 .3-.3 0-.6-.2-.4"/></g></svg>
\ No newline at end of file