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/1f975.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/1f975.svg')
-rw-r--r-- | public/emoji/1f975.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f975.svg b/public/emoji/1f975.svg new file mode 100644 index 000000000..09e99a3ed --- /dev/null +++ b/public/emoji/1f975.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#EA596E" cx="18" cy="18" r="18"/><path fill="#292F33" d="M26.125 29.261c-.028 0-.057-.003-.084-.01-8.424-1.942-15.996-.022-16.072-.002-.111.028-.231.005-.324-.066-.091-.072-.145-.181-.145-.297 0-3.178 3.713-6.872 8.5-6.872s8.5 3.694 8.5 6.872c0 .114-.052.223-.142.294-.067.052-.149.081-.233.081zM29 12c-5.554 0-7.802-4.367-7.895-4.553-.247-.494-.047-1.095.447-1.342.493-.247 1.092-.048 1.34.443C22.967 6.694 24.713 10 29 10c.553 0 1 .448 1 1s-.447 1-1 1zM7 12c-.552 0-1-.448-1-1s.448-1 1-1c5.083 0 5.996-3.12 6.033-3.253.145-.528.692-.848 1.219-.709.53.139.851.673.718 1.205C14.921 7.437 13.704 12 7 12z"/><ellipse fill="#292F33" cx="12" cy="16.5" rx="2.5" ry="3.5"/><ellipse fill="#292F33" cx="24" cy="16.5" rx="2.5" ry="3.5"/><path fill="#F4ABBA" d="M18.629 23.079v.827l-1.091.001v-.837c-2.277.127-4.191 1.162-5.455 2.516l.008.461c.086 2.932 2.08 5.802 5.992 5.802 3.899 0 5.892-2.851 5.991-5.773l.009-.284c-1.229-1.415-3.145-2.537-5.454-2.713z"/><path fill="#EA596E" d="M18 23.049c-.157 0-.308.014-.462.022v4.447c0 .301.244.545.545.545s.545-.244.545-.545V23.08c-.207-.017-.414-.031-.628-.031z"/><path fill="#5DADEC" d="M35.906 12.062c0 2.814-2.28 5.094-5.094 5.094-2.814 0-5.094-2.28-5.094-5.094s4.075-10.188 5.094-10.188 5.094 7.375 5.094 10.188zM8.573 8.438c0 2.313-1.875 4.188-4.188 4.188-2.313 0-4.188-1.875-4.188-4.188S3.547.063 4.385.063s4.188 6.062 4.188 8.375z"/></svg> \ No newline at end of file |