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/1f97d.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/1f97d.svg')
-rw-r--r-- | public/emoji/1f97d.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f97d.svg b/public/emoji/1f97d.svg new file mode 100644 index 000000000..cdb79f9f2 --- /dev/null +++ b/public/emoji/1f97d.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M18 9v11.756c-3 0-1.067 5.182-6 5.999-1.781.295-3.931.355-6 0-3.253-.559-4.824-3.027-5.042-7.681-.281-5.993 1.276-8.847 5.318-9.533C9.394 9.012 14 9 18 9z"/><path fill="#9AAAB4" d="M17.926 9v11.756c3 0 1.067 5.182 6 5.999 1.781.295 3.931.355 6 0 3.253-.559 4.824-3.027 5.042-7.681.281-5.993-1.276-8.847-5.318-9.533C26.532 9.012 21.926 9 17.926 9zM1.5 21C.675 21 0 20.325 0 19.5v-3c0-.825.675-1.5 1.5-1.5s1.5.675 1.5 1.5v3c0 .825-.675 1.5-1.5 1.5z"/><path fill="#9AAAB4" d="M34.5 21c-.825 0-1.5-.675-1.5-1.5v-3c0-.825.675-1.5 1.5-1.5s1.5.675 1.5 1.5v3c0 .825-.675 1.5-1.5 1.5z"/><path fill="#9AAAB4" d="M34.5 22c-.825 0-1.5-.675-1.5-1.5v-5c0-.825.675-1.5 1.5-1.5s1.5.675 1.5 1.5v5c0 .825-.675 1.5-1.5 1.5zm-33 0C.675 22 0 21.325 0 20.5v-5c0-.825.675-1.5 1.5-1.5s1.5.675 1.5 1.5v5c0 .825-.675 1.5-1.5 1.5z"/><path fill="#CCD6DD" d="M18 11v7.756c-4 0-2.615 5.396-7 6-1.583.218-2.161.263-4 0-2.892-.413-3.922-2.555-4.169-5.89-.325-4.394 1.266-6.959 4.859-7.466 2.771-.391 6.754-.4 10.31-.4z"/><path fill="#CCD6DD" d="M18 11v7.756c4 0 2.615 5.396 7 6 1.583.218 2.161.263 4 0 2.892-.413 3.922-2.555 4.169-5.89.325-4.394-1.266-6.959-4.859-7.466-2.771-.391-6.754-.4-10.31-.4z"/><path d="M26.993 11.252c-.655-.061-1.35-.107-2.077-.142l-3.695 10.151c.378.76.75 1.56 1.323 2.212l4.449-12.221zM18 11c-.646 0-1.308.001-1.973.004l-5.003 13.747c4.354-.621 2.984-5.995 6.976-5.995.601 0 1.07.133 1.466.342l2.937-8.068C20.937 11.003 19.435 11 18 11z" fill="#E1E8ED"/><path fill="#292F33" d="M35 16h-1v4h1c.55 0 1-.45 1-1v-2c0-.55-.45-1-1-1zM1 16c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h1v-4H1z"/></svg> \ No newline at end of file |