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/23f1.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/23f1.svg')
-rw-r--r-- | public/emoji/23f1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/23f1.svg b/public/emoji/23f1.svg index f7bab6c11..599d2469c 100644 --- a/public/emoji/23f1.svg +++ b/public/emoji/23f1.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,28 4,0 0,3 -4,0 0,-3 z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(22,35)" id="g22"><path id="path24" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8,0 c -1.1,0 -2,-0.9 -2,-2 0,-1.1 0.9,-2 2,-2 l 2,0 4,0 2,0 c 1.1,0 2,0.9 2,2 0,1.1 -0.9,2 -2,2"/></g><g transform="translate(28.1841,24.4933)" id="g26"><path id="path28" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.504,1.318 C -2.332,2.043 -2.416,3.313 -1.691,4.14 l 0,0 c 0.725,0.828 1.995,0.911 2.822,0.187 L 2.636,3.009 C 3.463,2.284 3.547,1.014 2.822,0.186 l 0,0 C 2.097,-0.641 0.827,-0.725 0,0"/></g><g transform="translate(18,26)" id="g30"><path id="path32" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.065,0 -11,-4.935 -11,-11 0,-6.065 4.935,-11 11,-11 6.065,0 11,4.935 11,11 C 11,-4.935 6.065,0 0,0"/></g><g transform="translate(18,4)" id="g34"><path id="path36" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.065,0 -11,4.935 -11,11 0,6.065 4.935,11 11,11 C 6.065,22 11,17.065 11,11 11,4.935 6.065,0 0,0 M 0,25 C -7.732,25 -14,18.732 -14,11 -14,3.268 -7.732,-3 0,-3 7.732,-3 14,3.268 14,11 14,18.732 7.732,25 0,25"/></g><g transform="translate(27,14)" id="g38"><path id="path40" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(19,24)" id="g42"><path id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(19,6)" id="g46"><path id="path48" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(12.7071,21.7071)" id="g50"><path id="path52" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,-0.391 0.391,-1.024 0,-1.414 -0.391,-0.391 -1.024,-0.391 -1.414,0 -0.391,0.39 -0.391,1.023 0,1.414 0.39,0.391 1.023,0.391 1.414,0"/></g><g transform="translate(24.7071,9.7071)" id="g54"><path id="path56" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,-0.391 0.391,-1.024 0,-1.414 -0.391,-0.391 -1.024,-0.391 -1.414,0 -0.391,0.39 -0.391,1.023 0,1.414 0.39,0.391 1.023,0.391 1.414,0"/></g><g transform="translate(9,16)" id="g58"><path id="path60" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.552,0 1,-0.448 1,-1 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1"/></g><g transform="translate(23.2929,21.7071)" id="g62"><path id="path64" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,0.391 1.024,0.391 1.414,0 0.391,-0.391 0.391,-1.024 0,-1.414 -0.39,-0.391 -1.023,-0.391 -1.414,0 -0.391,0.39 -0.391,1.023 0,1.414"/></g><g transform="translate(12,8)" id="g66"><path id="path68" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 7,7 c 0.391,0.391 1.023,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 l -7,-7 C 0.512,0.098 0.256,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M16 5h4v3h-4z"/><path fill="#8899A6" d="M22 1h-8c-1.1 0-2 .9-2 2s.9 2 2 2h8c1.1 0 2-.9 2-2s-.9-2-2-2zm6.184 10.507l-1.504-1.318c-.827-.725-.911-1.995-.186-2.822.725-.827 1.995-.911 2.822-.186l1.504 1.318c.827.725.911 1.995.186 2.822-.725.827-1.995.911-2.822.186z"/><circle fill="#F5F8FA" cx="18" cy="21" r="11"/><path fill="#66757F" d="M18 7C10.268 7 4 13.268 4 21s6.268 14 14 14 14-6.268 14-14S25.732 7 18 7zm0 25c-6.065 0-11-4.935-11-11s4.935-11 11-11 11 4.935 11 11-4.935 11-11 11z"/><path fill="#292F33" d="M27 22H17c-.552 0-1-.447-1-1s.448-1 1-1h10c.553 0 1 .447 1 1s-.447 1-1 1z"/><circle fill="#292F33" cx="18" cy="12" r="1"/><circle fill="#292F33" cx="18" cy="30" r="1"/><circle fill="#292F33" cx="12" cy="15" r="1"/><circle fill="#292F33" cx="24" cy="27" r="1"/><circle fill="#292F33" cx="9" cy="21" r="1"/><circle fill="#292F33" cx="24" cy="15" r="1"/><path fill="#DD2E44" d="M12 28c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l7-7c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-7 7c-.195.195-.451.293-.707.293z"/></svg> \ No newline at end of file |