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/1f336.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/1f336.svg')
| -rw-r--r-- | public/emoji/1f336.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f336.svg b/public/emoji/1f336.svg index a5f14a3bb..eaeef864d 100644 --- a/public/emoji/1f336.svg +++ b/public/emoji/1f336.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(4.0415,8.084)" id="g20"><path id="path22" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.89,-0.551 9.458,1.625 13.471,5.946 4.812,5.182 5,13 5,14 0,1 11.31,3.056 11,-5 C 29.042,3.75 22.042,-6 9.554,-6.97 3.572,-7.435 -0.125,-6.042 -1.833,-4.625 -4.522,-2.394 -2.583,0.291 0,0"/></g><g transform="translate(21.333,27.417)" id="g24"><path id="path26" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.446,1.553 3.311,3.827 7.167,2.958 11.417,2 13.18,-0.012 13.18,-3.678 13.18,-7.345 9.583,-4.167 9.083,-3.042 8.583,-1.917 6.5,-5.292 4.68,-1.762 4.064,-0.568 -0.782,-2.722 0,0"/></g><g transform="translate(26.2285,34.4937)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.138,-1.16 3.035,-2.732 2.205,-5.266 1.374,-7.8 3.482,-7.757 4.004,-6.217 4.524,-4.678 4.681,-1.366 3.569,0.113 2.458,1.592 -0.861,0.878 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DA2F47" d="M4.042 27.916c4.89.551 9.458-1.625 13.471-5.946 4.812-5.182 5-13 5-14s11.31-3.056 11 5c-.43 11.196-7.43 20.946-19.917 21.916-5.982.465-9.679-.928-11.387-2.345-2.69-2.231-.751-4.916 1.833-4.625z"/><path fill="#77B255" d="M30.545 6.246c.204-1.644.079-3.754-.747-4.853-1.111-1.479-4.431-.765-3.569.113.96.979 2.455 2.254 2.401 4.151-.044-.01-.085-.022-.13-.032-3.856-.869-6.721 1.405-7.167 2.958-.782 2.722 4.065.568 4.68 1.762 1.82 3.53 3.903.155 4.403 1.28s4.097 4.303 4.097.636c0-3.01-1.192-4.903-3.968-6.015z"/></svg> \ No newline at end of file |
