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/1f236.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/1f236.svg')
-rw-r--r-- | public/emoji/1f236.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f236.svg b/public/emoji/1f236.svg index 161b13898..93c5998e7 100644 --- a/public/emoji/1f236.svg +++ b/public/emoji/1f236.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:#f4900c;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><path id="path24" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13.248,13.514 11.467,0 0,2.574 -11.467,0 0,-2.574 z m 11.467,6.214 c 0,0.52 -0.26,0.702 -0.78,0.702 l -9.907,0 c -0.519,0 -0.78,-0.182 -0.78,-0.702 l 0,-1.873 11.467,0 0,1.873 z M 11.246,16.426 c 0,0.572 0.027,1.559 0.208,2.288 C 10.232,17.388 8.906,16.192 7.58,15.256 7.32,15.073 7.061,14.97 6.826,14.97 c -0.286,0 -0.546,0.13 -0.754,0.442 -0.13,0.182 -0.208,0.39 -0.208,0.598 0,0.286 0.13,0.546 0.468,0.78 3.095,2.002 5.721,5.018 7.437,8.19 l -6.708,0 c -0.469,0 -0.729,0.442 -0.729,0.962 0,0.546 0.26,0.936 0.729,0.936 l 7.643,0 c 0.364,0.858 0.677,1.742 0.885,2.601 0.13,0.467 0.416,0.675 0.884,0.675 0.103,0 0.208,0 0.311,-0.026 0.547,-0.104 0.755,-0.416 0.755,-0.754 0,-0.103 -0.026,-0.208 -0.053,-0.312 -0.208,-0.728 -0.467,-1.456 -0.754,-2.184 l 12.481,0 c 0.494,0 0.754,-0.39 0.754,-0.936 0,-0.52 -0.26,-0.962 -0.754,-0.962 l -13.364,0 c -0.546,-1.014 -1.119,-2.002 -1.769,-2.964 0.494,0.13 1.456,0.182 2.185,0.182 l 8.086,0 c 1.586,0 2.314,-0.65 2.314,-2.184 l 0,-11.363 c 0,-1.82 -0.936,-2.496 -3.146,-2.496 -1.066,0 -2.054,0.105 -2.808,0.286 -0.442,0.105 -0.729,0.416 -0.729,0.884 0,0.078 0,0.183 0.027,0.286 0.103,0.443 0.416,0.729 0.805,0.729 0.079,0 0.157,0 0.26,-0.052 0.599,-0.156 1.457,-0.312 2.158,-0.312 1.223,0 1.483,0.208 1.483,1.091 l 0,2.679 -11.467,0 0,-5.07 c 0,-0.468 -0.416,-0.78 -0.987,-0.78 -0.599,0 -1.015,0.312 -1.015,0.78 l 0,9.75 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" 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.246 19.574c0-.572.026-1.56.208-2.288-1.222 1.326-2.548 2.521-3.874 3.458-.26.183-.52.286-.754.286-.286 0-.546-.13-.754-.442-.13-.182-.208-.39-.208-.598 0-.286.13-.546.468-.78 3.095-2.002 5.721-5.018 7.437-8.19H7.061c-.469 0-.729-.441-.729-.962 0-.546.26-.936.729-.936h7.644c.364-.858.677-1.742.885-2.601.13-.468.416-.676.884-.676.104 0 .208 0 .312.026.547.104.755.416.755.754 0 .104-.026.208-.053.312-.208.729-.468 1.456-.754 2.185h12.48c.494 0 .754.39.754.936 0 .521-.26.962-.754.962H15.849c-.546 1.015-1.118 2.003-1.769 2.965.494-.13 1.456-.183 2.185-.183h8.086c1.586 0 2.314.65 2.314 2.185v11.362c0 1.82-.937 2.496-3.146 2.496-1.066 0-2.054-.104-2.808-.286-.442-.104-.728-.416-.728-.884 0-.078 0-.183.026-.286.104-.442.416-.729.806-.729.078 0 .156 0 .26.052.599.156 1.457.312 2.158.312 1.223 0 1.482-.208 1.482-1.092v-2.679H13.248v5.07c0 .468-.416.78-.987.78-.599 0-1.015-.312-1.015-.78v-9.749zm13.469-3.302c0-.52-.26-.702-.78-.702h-9.906c-.52 0-.78.182-.78.702v1.872h11.467v-1.872zm-11.467 6.214h11.467v-2.574H13.248v2.574z"/></svg> \ No newline at end of file |