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/1f449-1f3fe.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/1f449-1f3fe.svg')
| -rw-r--r-- | public/emoji/1f449-1f3fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f449-1f3fe.svg b/public/emoji/1f449-1f3fe.svg index 850a672de..75257c127 100644 --- a/public/emoji/1f449-1f3fe.svg +++ b/public/emoji/1f449-1f3fe.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(15.8555,5)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 2.395,0.208 3.068,1.792 0.698,1.639 -0.622,2.309 -0.622,2.309 0,0 1.914,-0.059 2.622,1.941 0.668,1.885 -0.958,2.75 -0.958,2.75 0,0 1.871,0.307 2.417,2.292 C 6.986,12.755 5.36,14 5.36,14 l 12.208,0 c 0.959,0 2.576,0.542 2.577,2.543 0.001,2 -1.66,2.457 -2.577,2.457 l -16.5,0 -4,0 c -1,0 -1,1 0,1 l 2.666,0 c 3.792,0 6.143,2.038 6.792,2.751 0.651,0.713 0.98,1.667 0.735,2.82 -0.415,1.956 -1.92,1.53 -3.198,0.975 C 0.985,25.209 -3.4,24.292 -5.475,24.013 -11.332,23.222 -15.85,18.204 -15.855,12.129 -15.859,5.503 -10.558,0.005 -3.932,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M15.856 31s2.394-.208 3.068-1.792c.697-1.639-.622-2.309-.622-2.309s1.914.059 2.622-1.941c.668-1.885-.958-2.75-.958-2.75s1.871-.307 2.417-2.292C22.842 18.245 21.216 17 21.216 17h12.208c.959 0 2.575-.542 2.576-2.543.002-2-1.659-2.457-2.576-2.457h-20.5c-1 0-1-1 0-1h2.666c3.792 0 6.143-2.038 6.792-2.751.65-.713.979-1.667.734-2.82-.415-1.956-1.92-1.529-3.197-.975-3.078 1.337-7.464 2.254-9.538 2.533C4.523 7.778.006 12.796 0 18.871-.004 25.497 5.298 30.995 11.924 31h3.932z"/></svg> \ No newline at end of file |
