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/3297.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/3297.svg')
-rw-r--r-- | public/emoji/3297.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/3297.svg b/public/emoji/3297.svg index b525207fb..7adbcf199 100644 --- a/public/emoji/3297.svg +++ b/public/emoji/3297.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,18)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.94 -8.059,-18 -18,-18 -9.941,0 -18,8.06 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(26.3906,20.4976)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.514,0 0.811,0.189 0.811,0.783 l 0,5.399 C 0.811,6.802 0.514,6.937 0,6.937 l -7.503,0 c -0.54,0 -0.81,-0.135 -0.81,-0.755 l 0,-5.399 C -8.313,0.189 -8.043,0 -7.503,0 L 0,0 Z m -5.236,-1.862 c -0.108,-6.29 -1.971,-10.177 -6.316,-12.606 -0.216,-0.135 -0.432,-0.216 -0.621,-0.216 -0.324,0 -0.648,0.162 -0.864,0.513 -0.135,0.189 -0.189,0.405 -0.189,0.621 0,0.324 0.162,0.593 0.486,0.809 3.86,2.159 5.426,5.129 5.533,10.879 l -0.809,0 c -1.62,0 -2.322,0.62 -2.322,2.132 l 0,6.424 c 0,1.539 0.702,2.187 2.322,2.187 l 8.53,0 c 1.593,0 2.321,-0.648 2.321,-2.187 l 0,-6.424 c 0,-1.512 -0.728,-2.132 -2.321,-2.132 l -1.485,0 0,-9.799 c 0,-0.621 0.215,-0.728 1.512,-0.728 1.133,0 1.511,0.188 1.7,0.782 0.162,0.648 0.27,1.917 0.297,2.996 0,0.486 0.351,0.783 0.863,0.783 l 0.081,0 C 4.076,-7.855 4.4,-8.125 4.4,-8.637 l 0,-0.055 C 4.373,-10.338 4.185,-11.904 3.753,-12.903 3.591,-13.281 3.32,-13.578 2.97,-13.794 2.457,-14.09 1.593,-14.279 0.433,-14.279 l -0.459,0 c -2.456,0.026 -2.943,0.594 -2.943,1.97 l 0,10.447 -2.267,0 z m -11.526,-5.372 c 0,1.242 0.054,2.43 0.162,3.59 -0.945,-0.972 -1.97,-1.943 -3.077,-2.807 -0.189,-0.136 -0.405,-0.217 -0.621,-0.217 -0.324,0 -0.648,0.163 -0.864,0.487 -0.135,0.189 -0.189,0.404 -0.189,0.594 0,0.324 0.162,0.648 0.432,0.836 2.699,1.863 5.965,5.318 7.261,7.909 0.081,0.135 0.108,0.243 0.108,0.351 0,0.189 -0.162,0.297 -0.486,0.297 l -5.857,0 c -0.486,0 -0.756,0.378 -0.756,0.918 0,0.54 0.27,0.944 0.756,0.944 l 3.104,0 0,3.833 c 0,0.486 0.432,0.756 1.026,0.756 0.62,0 1.053,-0.27 1.053,-0.756 l 0,-3.833 1.754,0 c 1.053,0 1.727,-0.593 1.727,-1.511 0,-0.351 -0.107,-0.756 -0.296,-1.188 -0.675,-1.323 -1.728,-2.861 -2.807,-4.183 1.295,-1.323 2.483,-2.241 3.427,-2.862 0.351,-0.216 0.513,-0.486 0.513,-0.81 0,-0.215 -0.081,-0.405 -0.215,-0.62 -0.189,-0.297 -0.487,-0.433 -0.756,-0.433 -0.189,0 -0.405,0.055 -0.567,0.189 -0.972,0.729 -1.943,1.674 -2.969,2.781 0.108,-1.35 0.162,-2.429 0.162,-3.725 l 0,-7.396 c 0,-0.486 -0.406,-0.756 -1.026,-0.756 -0.594,0 -0.999,0.297 -0.999,0.756 l 0,6.856 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M36 18c0 9.94-8.059 18-18 18S0 27.94 0 18C0 8.059 8.059 0 18 0s18 8.059 18 18z"/><path fill="#FFF" d="M9.628 22.736c0-1.242.054-2.43.162-3.59-.945.972-1.97 1.943-3.077 2.807-.189.136-.405.217-.621.217-.324 0-.648-.162-.864-.486-.134-.19-.188-.405-.188-.594 0-.324.162-.648.432-.837 2.699-1.862 5.965-5.317 7.261-7.909.081-.135.108-.243.108-.351 0-.189-.162-.297-.486-.297H6.498c-.486 0-.756-.378-.756-.917 0-.54.27-.945.756-.945h3.104V6.001c0-.486.432-.756 1.026-.756.621 0 1.053.27 1.053.756v3.833h1.754c1.053 0 1.727.594 1.727 1.511 0 .351-.108.756-.297 1.188-.675 1.323-1.727 2.861-2.807 4.184 1.295 1.323 2.483 2.241 3.428 2.861.351.216.513.486.513.811 0 .215-.081.404-.216.62-.189.297-.486.433-.756.433-.189 0-.405-.055-.567-.189-.972-.729-1.943-1.674-2.969-2.78.108 1.35.162 2.429.162 3.725v7.396c0 .485-.405.756-1.026.756-.594 0-.999-.297-.999-.756v-6.858zm11.526-5.371c-.107 6.29-1.971 10.176-6.316 12.606-.216.135-.432.216-.621.216-.324 0-.648-.162-.864-.513-.135-.189-.189-.405-.189-.621 0-.324.162-.594.486-.809 3.86-2.159 5.426-5.129 5.533-10.878h-.809c-1.62 0-2.322-.621-2.322-2.132V8.808c0-1.539.702-2.187 2.322-2.187h8.53c1.593 0 2.321.648 2.321 2.187v6.424c0 1.512-.728 2.132-2.321 2.132H25.42v9.798c0 .621.215.729 1.512.729 1.133 0 1.511-.188 1.7-.782.162-.649.27-1.917.297-2.996 0-.486.351-.783.863-.783h.081c.594.027.918.297.918.81v.055c-.027 1.646-.216 3.212-.647 4.211-.162.378-.433.675-.783.891-.513.297-1.377.485-2.537.485h-.459c-2.456-.026-2.942-.594-2.942-1.97V17.365h-2.269zm5.237-1.863c.514 0 .811-.189.811-.783V9.321c0-.621-.297-.755-.811-.755h-7.503c-.54 0-.81.135-.81.755v5.399c0 .594.27.783.81.783h7.503z"/></svg> \ No newline at end of file |