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/1f9f7.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/1f9f7.svg')
-rw-r--r-- | public/emoji/1f9f7.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9f7.svg b/public/emoji/1f9f7.svg new file mode 100644 index 000000000..a37a0488e --- /dev/null +++ b/public/emoji/1f9f7.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M5.864 24.272C2.626 24.272 0 26.897 0 30.136S2.626 36 5.864 36s5.864-2.625 5.864-5.864-2.625-5.864-5.864-5.864zm0 10.053c-2.313 0-4.189-1.875-4.189-4.189 0-2.313 1.875-4.189 4.189-4.189s4.189 1.875 4.189 4.189c0 2.313-1.875 4.189-4.189 4.189zM19.67 3.938c-1.131 1.131-1.924 2.197-2.441 3.211-.427.835-.241 1.852.422 2.515l8.684 8.684c.663.663 1.68.849 2.515.422 1.014-.518 2.08-1.31 3.211-2.441 5.133-5.133 4.381-9.929.959-13.351s-8.217-4.173-13.35.96z"/><path fill="#66757F" d="M30.544 9.849c-.616 2.499-4.393 4.096-6.195.878-1.848 2.601 0 5.214 1.182 6.816-2.072-1.876-5.127-4.89-7.222-7.222 2.047 1.467 3.85 1.516 3.85.851 0-2.42 2.133-5.887 4.552-5.887s4.412 2.215 3.833 4.564z"/><path fill="#99AAB5" d="M1.356 26.763c.621-1.188 8.854-12.722 17.213-19.194l.98 1.265c-7.324 5.671-14.792 15.65-16.463 18.168-.156.235-1.73-.239-1.73-.239zm8.292 7.661l-.714-1.432C10 32.46 21.169 24.632 27.6 16.634l1.246 1.003c-6.431 8-17.591 15.986-19.198 16.787z"/></svg> \ No newline at end of file |