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/1f1e8-1f1f3.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/1f1e8-1f1f3.svg')
-rw-r--r-- | public/emoji/1f1e8-1f1f3.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e8-1f1f3.svg b/public/emoji/1f1e8-1f1f3.svg index 646cea9d9..c6fe22390 100644 --- a/public/emoji/1f1e8-1f1f3.svg +++ b/public/emoji/1f1e8-1f1f3.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(36,9)" id="g20"><path id="path22" style="fill:#de2910;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(7,25.0488)" id="g24"><path id="path26" style="fill:#ffde02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.929,-2.67 3.755,-2.729 1.502,-4.436 2.321,-7.143 0,-5.528 -2.321,-7.143 -1.502,-4.436 -3.755,-2.729 -0.929,-2.67 0,0 Z"/></g><g transform="translate(13,28.4722)" id="g28"><path id="path30" style="fill:#ffde02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.34,-0.688 1.099,-0.798 0.55,-1.334 0.679,-2.09 0,-1.733 -0.679,-2.09 l 0.13,0.756 -0.55,0.536 0.76,0.11 L 0,0 Z"/></g><g transform="translate(15,24.4722)" id="g32"><path id="path34" style="fill:#ffde02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.34,-0.688 1.099,-0.798 0.55,-1.334 0.679,-2.09 0,-1.733 -0.679,-2.09 l 0.13,0.756 -0.55,0.536 0.76,0.11 L 0,0 Z"/></g><g transform="translate(15,20.4722)" id="g36"><path id="path38" style="fill:#ffde02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.34,-0.688 1.099,-0.798 0.55,-1.334 0.679,-2.09 0,-1.733 -0.679,-2.09 l 0.13,0.756 -0.55,0.536 0.76,0.11 L 0,0 Z"/></g><g transform="translate(13,16.4727)" id="g40"><path id="path42" style="fill:#ffde02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.34,-0.689 1.099,-0.799 0.55,-1.334 0.679,-2.091 0,-1.734 l -0.679,-0.357 0.13,0.757 -0.55,0.535 0.76,0.11 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DE2910" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#FFDE02" d="M7 10.951l.929 2.671 2.826.058-2.253 1.708.819 2.706L7 16.479l-2.321 1.615.819-2.706-2.253-1.708 2.826-.058zm6-3.423l.34.688.759.11-.549.536.129.756L13 9.261l-.679.357.13-.756-.55-.536.76-.11zm2 4l.34.688.759.11-.549.536.129.756-.679-.357-.679.357.13-.756-.55-.536.76-.11zm0 4l.34.688.759.11-.549.536.129.756-.679-.357-.679.357.13-.756-.55-.536.76-.11zm-2 3.999l.34.689.759.11-.549.535.129.757-.679-.356-.679.356.13-.757-.55-.535.76-.11z"/></svg> \ No newline at end of file |