Merge branch 'master' into patch-2

1 files changed, 2 insertions, 0 deletions

diff --git a/public/emoji/1f469-1f469-1f466-1f466.svg b/public/emoji/1f469-1f469-1f466-1f466.svg
new file mode 100644
index 000000000..8bd591103
--- /dev/null
+++ b/public/emoji/1f469-1f469-1f466-1f466.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="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="m32 62h-25.1c0-8.4 25.1-8.4 25.1 0" fill="#29b6f6"/><path d="m19.4 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.3-8.5-10.9-8.5" fill="#ffb300"/><path d="m9.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.2 0-2.2-3.5 0-3.5" fill="#ffdd67"/><g fill="#937237"><circle cx="14.7" cy="49.8" r="1.8"/><circle cx="24.2" cy="49.8" r="1.8"/><path d="m16.3 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 0-.6.2-.4"/></g></svg>
\ No newline at end of file