Merge branch 'master' into development

1 files changed, 2 insertions, 0 deletions

diff --git a/public/emoji/1f469-1f469-1f467-1f467.svg b/public/emoji/1f469-1f469-1f467-1f467.svg
new file mode 100644
index 000000000..73760fbb4
--- /dev/null
+++ b/public/emoji/1f469-1f469-1f467-1f467.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="M47,2c-6.3,0-6.9,2.5-6.9,2.5S32.3,4.3,32,15.9C31.7,4.3,23.9,4.5,23.9,4.5S23.3,2,17,2C7.3,2,2,8.3,2,16.7
+			v18.5h60V16.7C62,8.3,56.7,2,47,2z" fill="#ffb300"/><path d="M32,34.7C31.6,29,2,29,2,34.8V62h60V34.8C62,29,32.4,29,32,34.7z" 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="m57.6 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.8s-3.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="51.9" cy="20.3" r="2.2"/><circle cx="41.1" cy="20.3" r="2.2"/><path d="m42.9 27.1c2.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.4-1.8 0-3.2-1.1-3.9-2.4-.2-.3 0-.7.3-.5"/></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><path d="m55 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="m44.3 37.8c-6.2 0-10.4 3.2-10.4 7.1 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.1c.1-4-3.9-7.2-10.4-7.2"/><path d="m32 62h25c0-8.4-25-8.4-25 0"/></g><path d="m54.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.5.1 9.7-2.6 9.7-6.1" fill="#ffdd67"/><g fill="#937237"><path d="m50.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="39.9" cy="49.8" r="1.8"/><path d="m47.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.1-.6-.2-.4"/></g></svg>
\ No newline at end of file