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/2618.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/2618.svg')
-rw-r--r-- | public/emoji/2618.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2618.svg b/public/emoji/2618.svg index f4b39ae44..72eaf4755 100644 --- a/public/emoji/2618.svg +++ b/public/emoji/2618.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.3403,16.7917)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.198,1.475 2.669,2.208 2.669,4.542 0,2.333 -5.759,6.416 -14.009,-1.334 3.812,5.313 6.541,14.509 2.202,14.509 -1.47,0 -2.579,-1.342 -4.327,-1.342 -2.375,0 -2.667,2.833 -4.875,2.833 -2.584,0 -5,-6.25 1,-15 -1.5,1.625 -11.084,6.625 -13.003,1.269 -0.628,-1.753 1.732,-2.78 1.544,-4.519 -0.178,-1.654 -2.597,-2.037 -2.597,-4.372 0,-3.293 8.047,-4.834 16.044,1.613 -0.245,-4.523 0.556,-10.515 3.856,-14.158 1.344,-1.484 2.408,-0.551 2.823,-0.187 0.416,0.366 1.604,1.414 0.185,2.823 -3.834,3.807 -5.225,8.174 -5.619,11.381 2.043,-2.215 12.356,-8.742 15.517,-2.767 C 2.292,-3.042 -0.232,-1.733 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M32.34 19.208c.198-1.475 2.669-2.208 2.669-4.542C35.009 12.333 29.25 8.25 21 16c3.812-5.312 6.542-14.509 2.203-14.509-1.47 0-2.579 1.342-4.328 1.342C16.5 2.833 16.208 0 14 0c-2.583 0-5 6.25 1 15-1.5-1.625-11.083-6.625-13.002-1.269-.628 1.753 1.731 2.781 1.544 4.519-.178 1.654-2.597 2.037-2.597 4.372 0 3.293 8.048 4.834 16.044-1.613-.245 4.524.557 10.515 3.857 14.158 1.344 1.483 2.407.551 2.822.187.416-.365 1.604-1.414.185-2.822-3.834-3.807-5.225-8.174-5.619-11.381 2.043 2.215 12.357 8.742 15.517 2.767.881-1.668-1.643-2.977-1.411-4.71z"/></svg> \ No newline at end of file |