diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg new file mode 100644 index 000000000..e5d56cb36 --- /dev/null +++ b/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M18 30v6H2s-1.995-4.989 2-7c2.155-1.085 4 0 4 0l10 1zm0 0v6h16s1.995-4.989-2-7c-2.155-1.085-4 0-4 0l-10 1z"/><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="#7C533E" d="M13.64 28.302c1.744 1.268 2.848 1.963 4.36 1.963 1.512 0 2.615-.696 4.359-1.963v-3.811h-8.72v3.811z"/><path fill="#664131" d="M13.632 25.5c.368 2.027 2.724 2.219 4.364 2.219 1.639 0 4.004-.191 4.363-2.219v-3.019h-8.728V25.5z"/><path fill="#7C533E" d="M26.194 13.312c-.068 0-.133.019-.199.032C26 12.854 26 12.399 26 12c0-3-3-5-8-5s-8 2-8 5c0 .399 0 .854.005 1.345-.066-.013-.131-.032-.2-.032-.905 0-1.639 1.175-1.639 2.623 0 1.448.734 2.622 1.639 2.622.175 0 .34-.055.498-.136.265 2.106.759 4.172 1.697 5.578 2 3 4 3 6 3s4 0 6-3c.937-1.406 1.432-3.472 1.697-5.579.158.081.323.136.497.136.905 0 1.639-1.174 1.639-2.622s-.733-2.623-1.639-2.623z"/><path fill="#0B0200" d="M18.821 3.118c.859.07 2.492-1.259 4.177-.741-1.037.821.282 1.908 1.076 2.469.469.331 2.76.29 3.115.686-1.729.778-.878 1.75-.575 2.494.384.945.563 1.949.563 2.942 0 3.604-.706 5.047-1.412 3.604-.706-1.441-1.356-3.368-1.356-3.368s-4.292.485-5.704-.957l.503 1.796s-1.396-.332-2.909-2.319l-.519 1.772s-.971-.477-2.723-1.969c0 0-2.118 1.442-2.824 5.046-.196 1.001-1.412 0-1.412-3.604 0-1.214.037-2.696.519-3.908.347-.873 1.514-1.745.045-3.085 1.642-.735 3.307.718 4.344.823.544-.868 2.87-3.366 3.824-3.589-.173 1.081.292 1.829 1.268 1.908z"/><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.5 15.5c0 .55-.45 1-1 1h-1c-.55 0-1-.45-1-1s.45-1 1-1h1c.55 0 1 .45 1 1m8 0c0-.55-.45-1-1-1h-1c-.55 0-1 .45-1 1s.45 1 1 1h1c.55 0 1-.45 1-1"/><path fill="#3D2E24" d="M20.834 21.179c-.691.301-1.978.821-3.108.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.135.282-.605.261-.887-.203-.686zM18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#BE1931" d="M33 29c-.81-1.299-6-2-9-2-1 0-3 3.063-6 3.063S13 27 12 27c-3 0-8.19.701-9 2-1.497 2.4 4 3 6 3s4.773-1 9-1 7 1 9 1 7.497-.6 6-3z"/><path fill="#99AAB5" d="M5.818 25.881c.691-.07 2.528 2.7 2.45 3.153-.078.454-4.212.618-4.443.25-.231-.368 1.302-3.333 1.993-3.403zm2.311 1.742c.173.27 3.225.117 3.28-.219.054-.336-1.324-2.367-1.834-2.31-.51.056-1.619 2.258-1.446 2.529zm24.032 1.661c-.23.369-4.364.204-4.443-.25-.078-.454 1.759-3.223 2.45-3.153.692.07 2.224 3.035 1.993 3.403zm-5.75-4.19c-.51-.057-1.888 1.975-1.834 2.31.054.336 3.106.489 3.28.219.173-.271-.936-2.473-1.446-2.529z"/></svg> \ No newline at end of file |