Merge branch 'glitch'

Conflicts:
	yarn.lock: caniuse-lite has been outdated in upstream for
	awhile, and we fixed it a few weeks ago in our fork

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg
index 5dadcd8b6..a110d6d47 100644
--- a/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M28 29H8c-3 0-4 7-4 7h28s-1-7-4-7z"/><path fill="#99AAB5" d="M18.8 34.8L20 33l-2-1-2 1 1.2 1.8L10 33l2 3h12l2-3z"/><path fill="#0B0200" d="M18 5c4 0 5.309.433 5.309.433S23.267 4.004 21.999 3c0 0 3 .999 3 2.999 0 0 4 0 5 3C29.999 9 29 8 27 8c0 0 2.117 1.839 2.446 6.05.329 4.212-1 8-1 8s.101-.854-.899-1.854c0 0-.338 2.829-2.977 4.826 0 0-1.026-1.606-3.026-2.606S16 21 14 23l-3 3s-4-4-4-10S12 5 18 5z"/><path fill="#7C533E" d="M14.269 29.479c1.466 1.065 2.964.98 3.672.98s2.194.085 3.66-.98v-5.664h-7.332v5.664z"/><path fill="#664131" d="M14.264 25.179c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.338v2.936z"/><path fill="#7C533E" d="M9.675 15.718c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.729 8.209 10.563 0 5.833-3.676 10.285-8.209 10.285-4.534 0-8.211-4.452-8.211-10.285"/><path fill="#0B0200" d="M21 10s1 4 3 6 1 6 1 6 2-3 2-7-3-9-3-9-3-3-10-2c0 0 2 0 3 1 0 0-7-1-10 4 0 0 2-2 5-1 0 0-2 1-3 5s1 8 1 8 3-11 11-11z"/><path fill="#BE1931" d="M18 13l5-1 1-2 2 2-1 3 1 2-2 2-1 2-1-2-4-2-4 2-1 2-1-2-2-2 1-2-1-3 2-2 1 2z"/><path d="M15.769 16c0 .465-.381.846-.847.846h-.845c-.465 0-.846-.381-.846-.846 0-.466.381-.847.846-.847h.845c.466.001.847.382.847.847m7 0c0-.465-.381-.846-.847-.846h-.845c-.465 0-.846.381-.846.846 0 .465.381.846.846.846h.845c.466 0 .847-.381.847-.846"/><path fill="#3D2E24" d="M18.777 20.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.19.423-.424.423m2.057 1.122c-.692.301-1.978.821-3.109.821H15.5c-.275 0-.5.225-.5.5s.225.5.5.5h4.204c.006 0 .007-.003.013-.003l.068.003c.581 0 1.016-.629 1.252-1.134.282-.606.261-.889-.203-.687z"/><path fill="#BE1931" d="M30.647 29.5c-.788-1.299-3.892-2.5-6.81-2.5-.973 0-2.919 1.851-5.837 1.851S13.136 27 12.163 27c-2.919 0-6.022 1.201-6.81 2.5-1.457 2.4.945 2.5 2.89 2.5 1.946 0 5.644-1 9.757-1s7.811 1 9.757 1c1.945 0 4.347-.1 2.89-2.5z"/><path fill="#99AAB5" d="M10.385 26.228c.362-.058 1.368 1.423 1.344 1.714-.024.291-2.196.478-2.331.248-.136-.23.625-1.904.987-1.962zm-4.538 3.303c.214.332 3.412-.078 3.43-.51.018-.431-1.679-2.47-2.21-2.362-.53.109-1.433 2.54-1.22 2.872zm20.746-1.341c-.135.23-2.307.043-2.331-.248-.024-.291.982-1.772 1.344-1.714.361.058 1.123 1.732.987 1.962zm2.33-1.53c-.531-.108-2.228 1.93-2.21 2.362.018.431 3.217.842 3.43.51.214-.333-.69-2.764-1.22-2.872z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M28 29H8c-3 0-4 7-4 7h28s-1-7-4-7z"/><path fill="#99AAB5" d="M12 36l-2-3 8 2 8-2-2 3z"/><path fill="#99AAB5" d="M18 32l2 1-2 3-2-3z"/><path fill="#0B0200" d="M18 5c4 0 5.309.433 5.309.433S23.267 4.004 21.999 3c0 0 3 .999 3 2.999 0 0 4 0 5 3C29.999 9 29 8 27 8c0 0 2.117 1.839 2.446 6.05.329 4.212-1 8-1 8s.101-.854-.899-1.854c0 0-.338 2.829-2.977 4.826 0 0-1.026-1.606-3.026-2.606S16 21 14 23l-3 3s-4-4-4-10S12 5 18 5z"/><path fill="#7C533E" d="M14.269 29.479c1.466 1.065 2.964.98 3.672.98s2.194.085 3.66-.98v-5.664h-7.332v5.664z"/><path fill="#664131" d="M14.264 25.179c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.338v2.936z"/><path fill="#7C533E" d="M9.675 15.718c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.729 8.209 10.563 0 5.833-3.676 10.285-8.209 10.285-4.534 0-8.211-4.452-8.211-10.285"/><path fill="#0B0200" d="M21 10s1 4 3 6 1 6 1 6 2-3 2-7-3-9-3-9-3-3-10-2c0 0 2 0 3 1 0 0-7-1-10 4 0 0 2-2 5-1 0 0-2 1-3 5s1 8 1 8 3-11 11-11z"/><path fill="#BE1931" d="M18 13l5-1 1-2 2 2-1 3 1 2-2 2-1 2-1-2-4-2-4 2-1 2-1-2-2-2 1-2-1-3 2-2 1 2z"/><path d="M15.769 16c0 .465-.381.846-.847.846h-.845c-.465 0-.846-.381-.846-.846 0-.466.381-.847.846-.847h.845c.466.001.847.382.847.847m7 0c0-.465-.381-.846-.847-.846h-.845c-.465 0-.846.381-.846.846 0 .465.381.846.846.846h.845c.466 0 .847-.381.847-.846"/><path fill="#BE1931" d="M30.647 29.5c-.788-1.299-3.892-2.5-6.81-2.5-.973 0-2.919 1.851-5.837 1.851S13.136 27 12.163 27c-2.919 0-6.022 1.201-6.81 2.5-1.457 2.4.945 2.5 2.89 2.5 1.946 0 5.644-1 9.757-1s7.811 1 9.757 1c1.945 0 4.347-.1 2.89-2.5z"/><path fill="#3D2E24" d="M18.777 20.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.19.423-.424.423m2.057 1.122c-.692.301-1.978.821-3.109.821H15.5c-.275 0-.5.225-.5.5s.225.5.5.5h4.204c.006 0 .007-.003.013-.003l.068.003c.581 0 1.016-.629 1.252-1.134.282-.606.261-.889-.203-.687z"/><path fill="#99AAB5" d="M10.385 26.228c.362-.058 1.368 1.423 1.344 1.714-.024.291-2.196.478-2.331.248-.136-.23.625-1.904.987-1.962zm-4.538 3.303c.214.332 3.412-.078 3.43-.51.018-.431-1.679-2.47-2.21-2.362-.53.109-1.433 2.54-1.22 2.872zm20.746-1.341c-.135.23-2.307.043-2.331-.248-.024-.291.982-1.772 1.344-1.714.361.058 1.123 1.732.987 1.962zm2.33-1.53c-.531-.108-2.228 1.93-2.21 2.362.018.431 3.217.842 3.43.51.214-.333-.69-2.764-1.22-2.872z"/></svg>
\ No newline at end of file