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/1f48b.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/1f48b.svg')
| -rw-r--r-- | public/emoji/1f48b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f48b.svg b/public/emoji/1f48b.svg index 492398c52..8a1454a50 100644 --- a/public/emoji/1f48b.svg +++ b/public/emoji/1f48b.svg @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(32.2012,28.209)" id="g20"><path id="path22" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.223,0.36 -7.568,3.963 -11.411,2.762 -3.843,-1.201 -3.543,-2.162 -5.464,-2.763 -1.922,-0.601 -2.222,0.36 -6.066,-0.841 -3.842,-1.201 -6.184,-7.206 -7.805,-8.768 0,0 -1.603,-1.62 -1.021,-3.483 0.582,-1.861 2.523,-1.32 2.523,-1.32 6.725,2.102 9.007,4.925 9.007,4.925 0,0 3.482,-1.021 6.364,-0.12 2.883,0.9 5.164,3.723 5.164,3.723 0,0 3.484,-1.021 10.209,1.081 0,0 1.902,0.661 1.32,2.523 C 2.238,-0.419 0,0 0,0"/></g><g transform="translate(31.1191,21.5435)" id="g24"><path id="path26" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.764,-1.801 -4.562,-5.644 -11.288,-7.747 -6.726,-2.101 -7.927,1.741 -13.691,-0.06 -1.921,-0.602 -2.582,-1.862 -2.282,-2.824 0.901,-2.881 8.407,-10.026 18.976,-6.723 C 2.283,-14.051 4.385,-3.902 3.483,-1.021 3.184,-0.06 1.921,0.601 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E75A70" d="M32.201 7.791c-2.223-.36-7.568-3.963-11.411-2.762s-3.542 2.162-5.464 2.763c-1.922.601-2.222-.36-6.065.841-3.842 1.201-6.184 7.206-7.805 8.768 0 0-1.603 1.621-1.021 3.483.583 1.861 2.523 1.32 2.523 1.32 6.726-2.102 9.007-4.925 9.007-4.925s3.482 1.021 6.364.12c2.882-.901 5.164-3.724 5.164-3.724s3.484 1.021 10.209-1.081c0 0 1.902-.661 1.32-2.522-.583-1.862-2.821-2.281-2.821-2.281zm-1.082 6.666c-5.764 1.801-4.562 5.644-11.288 7.747-6.726 2.102-7.927-1.74-13.691.061-1.921.601-2.582 1.861-2.281 2.824.9 2.881 8.407 10.025 18.976 6.723 10.568-3.303 12.67-13.452 11.769-16.333-.301-.963-1.564-1.623-3.485-1.022z"/></svg> \ No newline at end of file |
