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/1f9b7.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/1f9b7.svg')
| -rw-r--r-- | public/emoji/1f9b7.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9b7.svg b/public/emoji/1f9b7.svg new file mode 100644 index 000000000..49cc5f9c1 --- /dev/null +++ b/public/emoji/1f9b7.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M18 2C13 2 11.11-1.276 7.002.7 3 2.625 7 17.002 9 20c-.444 2.537-.59 8.787-.171 10.91.576 2.921 1.561 5.09 2.748 5.09 2 0 2.423-13.002 6.423-13V2zm0 0c5 0 6.89-3.276 10.998-1.3C33 2.625 29 17.002 27 20c.444 2.537.59 8.787.171 10.91-.575 2.921-1.561 5.09-2.748 5.09-2 0-2.423-13.002-6.423-13V2z"/><path fill="#9AAAB4" d="M18 7.259c-2.278 0-4.419-.81-5.444-1.563-.334-.245-.406-.715-.161-1.048.246-.335.714-.405 1.048-.161.84.617 2.722 1.273 4.556 1.273 1.97 0 3.942-.709 4.489-1.217.305-.282.777-.264 1.06.039.281.304.265.778-.039 1.06-.958.891-3.431 1.617-5.509 1.617z"/></svg> \ No newline at end of file |