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/1f202.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/1f202.svg')
| -rw-r--r-- | public/emoji/1f202.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f202.svg b/public/emoji/1f202.svg index b2c039cb7..7f1e8415d 100644 --- a/public/emoji/1f202.svg +++ b/public/emoji/1f202.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,4)" id="g20"><path id="path22" style="fill:#226699;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,28 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(11.2754,28.6763)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.648 0.432,1.026 1.134,1.026 1.809,1.026 2.321,0.648 2.321,0 l 0,-4.291 8.827,0 0,4.291 c 0,0.648 0.405,1.026 1.107,1.026 0.675,0 1.187,-0.378 1.187,-1.026 l 0,-4.291 4.13,0 c 0.729,0 1.027,-0.459 1.027,-1.053 0,-0.594 -0.298,-1.08 -0.999,-1.08 l -4.158,0 0,-2.888 c 0,-3.267 -0.674,-5.831 -1.969,-7.721 -1.674,-2.428 -4.671,-4.183 -7.991,-4.75 -0.135,-0.027 -0.243,-0.027 -0.351,-0.027 -0.593,0 -0.945,0.297 -1.052,0.837 -0.027,0.108 -0.027,0.188 -0.027,0.297 0,0.54 0.35,0.89 0.971,0.999 2.645,0.459 5.237,2.051 6.533,3.94 1.079,1.567 1.592,3.698 1.592,6.884 l 0,2.429 -8.827,0 0,-6.641 c 0,-0.674 -0.512,-1.025 -1.187,-1.025 -0.702,0 -1.134,0.351 -1.134,1.025 l 0,6.641 -4.157,0 c -0.701,0 -0.998,0.486 -0.998,1.08 0,0.594 0.297,1.025 1.025,1.025 L 0,-4.319 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#269" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M11.275 7.324c0-.648.432-1.026 1.134-1.026.675 0 1.188.378 1.188 1.026v4.291h8.827V7.324c0-.648.404-1.026 1.107-1.026.675 0 1.188.378 1.188 1.026v4.291h4.13c.729 0 1.026.459 1.026 1.053 0 .594-.298 1.08-.999 1.08h-4.157v2.888c0 3.266-.675 5.831-1.97 7.72-1.674 2.429-4.67 4.184-7.99 4.75-.135.027-.243.027-.351.027-.594 0-.945-.297-1.053-.837-.027-.108-.027-.188-.027-.297 0-.54.351-.891.972-.999 2.645-.459 5.236-2.051 6.532-3.941 1.079-1.566 1.593-3.698 1.593-6.883v-2.429h-8.827v6.641c0 .674-.513 1.025-1.188 1.025-.702 0-1.134-.352-1.134-1.025v-6.641H7.119c-.702 0-.999-.486-.999-1.08 0-.594.297-1.025 1.025-1.025h4.13V7.324z"/></svg> \ No newline at end of file |
