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/1f62b.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/1f62b.svg')
-rw-r--r-- | public/emoji/1f62b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f62b.svg b/public/emoji/1f62b.svg index 094fd685d..4253adad0 100644 --- a/public/emoji/1f62b.svg +++ b/public/emoji/1f62b.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:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(18,14.5)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.333,0 -10.485,-8.354 -10.496,-8.438 -0.022,-0.17 0.046,-0.339 0.179,-0.449 C -10.227,-8.961 -10.114,-9 -10,-9 c 0.053,0 0.106,0.009 0.158,0.025 C -9.783,-8.955 -3.874,-7 0,-7 c 5.595,0 9.745,-1.933 9.786,-1.952 0.161,-0.077 0.359,-0.06 0.507,0.047 0.147,0.107 0.226,0.286 0.203,0.467 C 10.485,-8.354 9.333,0 0,0"/></g><g transform="translate(29,26)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.554,0 -7.802,4.367 -7.895,4.553 -0.247,0.494 -0.046,1.095 0.448,1.342 0.493,0.245 1.092,0.047 1.34,-0.444 C -6.033,5.306 -4.287,2 0,2 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(7,26)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.552,0 -1,0.448 -1,1 -1,1.552 -0.552,2 0,2 5.083,2 5.996,5.12 6.033,5.253 6.178,5.781 6.725,6.101 7.252,5.962 7.782,5.823 8.103,5.289 7.97,4.757 7.921,4.563 6.704,0 0,0"/></g><g transform="translate(18,13)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,0 6,-2 6,-2 l -12,0 c 0,0 2,2 6,2"/></g><g transform="translate(6.001,17)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.304,0 -0.604,0.138 -0.801,0.4 -0.331,0.442 -0.242,1.069 0.2,1.4 C -0.458,1.907 2.35,3.982 6.255,4.732 3.78,5.973 1.033,6 0.998,6 0.446,6.001 -0.001,6.45 0,7.001 0,7.553 0.447,8 0.999,8 1.22,8 6.451,7.962 9.706,4.707 9.992,4.421 10.078,3.991 9.923,3.617 9.768,3.244 9.403,3 8.999,3 4.386,3 0.636,0.228 0.599,0.2 0.419,0.065 0.208,0 0,0"/></g><g transform="translate(29.999,17.001)" id="g44"><path id="path46" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.208,0 -0.418,0.064 -0.598,0.198 -0.038,0.029 -3.811,2.801 -8.401,2.801 -0.404,0 -0.77,0.244 -0.924,0.617 -0.155,0.374 -0.069,0.804 0.217,1.09 3.256,3.255 8.486,3.293 8.707,3.293 C -0.447,7.999 -0.001,7.552 0,7 0.001,6.449 -0.446,6 -0.997,5.999 -1.033,5.999 -3.78,5.972 -6.255,4.731 -2.35,3.981 0.458,1.906 0.601,1.799 1.042,1.468 1.132,0.843 0.802,0.4 0.605,0.139 0.305,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><path fill="#664500" d="M18 21.5c-9.333 0-10.485 8.354-10.496 8.438-.021.171.046.34.179.449.09.074.203.113.317.113.053 0 .106-.009.158-.025.059-.02 5.968-1.975 9.842-1.975 5.595 0 9.745 1.933 9.786 1.952.161.077.358.06.507-.047.147-.107.226-.286.203-.468C28.485 29.854 27.333 21.5 18 21.5zM29 10c-5.554 0-7.802-4.367-7.895-4.553-.247-.494-.047-1.095.447-1.342.493-.246 1.092-.048 1.34.443C22.967 4.694 24.713 8 29 8c.553 0 1 .448 1 1s-.447 1-1 1zM7 10c-.552 0-1-.448-1-1s.448-1 1-1c5.083 0 5.996-3.12 6.033-3.253.145-.528.692-.848 1.219-.709.53.139.851.673.718 1.205C14.921 5.437 13.704 10 7 10z"/><path fill="#CCD6DD" d="M18 23c4 0 6 2 6 2H12s2-2 6-2z"/><path fill="#664500" d="M6.001 19c-.304 0-.604-.138-.801-.4-.332-.441-.242-1.068.2-1.399.143-.107 2.951-2.183 6.856-2.933C9.781 13.027 7.034 13 6.999 13c-.552-.002-.999-.45-.998-1.002 0-.551.447-.998.999-.998.221 0 5.452.038 8.707 3.293.286.286.372.716.217 1.09-.155.373-.52.617-.924.617-4.613 0-8.363 2.772-8.4 2.8-.18.135-.391.2-.599.2zm23.998-.001c-.208 0-.418-.064-.598-.198C29.363 18.772 25.59 16 21 16c-.404 0-.77-.244-.924-.617-.155-.374-.069-.804.217-1.09C23.549 11.038 28.779 11 29 11c.552 0 .998.447.999.998.001.552-.446 1-.997 1.002-.036 0-2.783.027-5.258 1.268 3.905.75 6.713 2.826 6.855 2.933.441.331.531.956.201 1.398-.196.261-.496.4-.801.4z"/></svg> \ No newline at end of file |