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/1f9fb.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/1f9fb.svg')
| -rw-r--r-- | public/emoji/1f9fb.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9fb.svg b/public/emoji/1f9fb.svg new file mode 100644 index 000000000..e8f7252f4 --- /dev/null +++ b/public/emoji/1f9fb.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M7 0h17v24H7z"/><path fill="#99AAB5" d="M7 12h17v12H7z"/><ellipse fill="#CCD6DD" cx="7" cy="12" rx="7" ry="12"/><ellipse fill="#E1E8ED" cx="24" cy="12" rx="8" ry="12"/><path fill="#E1E8ED" d="M32 12v12c0 9 4 12 4 12H18s-4-3-4-12V11l18 1z"/><path fill="#F5F8FA" d="M32 12c0-4.924-1.979-9.15-4.807-11H11.322C13.549 3.284 15 7.316 15 12v14c.429 5.683 2.683 8.3 3.383 9H35.05C33.867 33.496 32 30.151 32 24V12z"/><ellipse fill="#99AAB5" cx="6" cy="12" rx="3" ry="5"/><path fill="#66757F" d="M3.25 10.01C3.712 8.24 4.768 7 6 7c1.657 0 3 2.239 3 5 0 .616-.076 1.2-.198 1.745-.649-2.088-2.871-3.642-5.552-3.735z"/><path fill="#CCD6DD" d="M16.5 13H15v-1h1.5c.275 0 .5.225.5.5s-.225.5-.5.5zm4 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5zm4 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5zm4 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5zm3.5 0h-1.5c-.275 0-.5-.225-.5-.5s.225-.5.5-.5H32v1zM16.5 25H15v-1h1.5c.275 0 .5.225.5.5s-.225.5-.5.5zm4 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5zm4 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5zm4 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5zm3.5 0h-1.5c-.275 0-.5-.225-.5-.5s.225-.5.5-.5H32v1z"/></svg> \ No newline at end of file |