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/1f9f4.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/1f9f4.svg')
-rw-r--r-- | public/emoji/1f9f4.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9f4.svg b/public/emoji/1f9f4.svg new file mode 100644 index 000000000..2cb39a76e --- /dev/null +++ b/public/emoji/1f9f4.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M17 3h2v5h-2z"/><path fill="#99AAB5" d="M12 12V9c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v3H12z"/><path fill="#FFAC33" d="M24 11H12c-5 0-6 21-6 21 0 2.2 1.8 4 4 4h16c2.2 0 4-1.8 4-4 0 0-1-21-6-21z"/><path fill="#CCD6DD" d="M8 4s2-4 7-4h6c2 0 2 4 0 4h-6c-5 0-6 1-6 1L8 4z"/><path fill="#99AAB5" d="M8.464 4.464L9 5s1-1 6-1h6c.975 0 1.472-.949 1.496-1.922C21 2.078 19.524 2 15 2c-3.859 0-5.519 1.377-6.536 2.464z"/><path fill="#FFCC4D" d="M23.5 13h-11c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h11c.275 0 .5.225.5.5s-.225.5-.5.5z"/><path fill="#FFE8B6" d="M18 18s-4 4.791-4 7c0 2.209 1.791 4 4 4s4-1.791 4-4-4-7-4-7z"/></svg> \ No newline at end of file |