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/1f408.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/1f408.svg')
-rw-r--r-- | public/emoji/1f408.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f408.svg b/public/emoji/1f408.svg index 68fe8f2a1..7997e6ee2 100644 --- a/public/emoji/1f408.svg +++ b/public/emoji/1f408.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,24)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4.252 -3.141,7 -8,7 -8.553,7 -9,6.552 -9,6 -9,5.448 -8.553,5 -8,5 -6.196,5 -2,4.513 -2,0 -2,-2.881 -3.851,-4.172 -6.054,-4.692 -6.218,-4.619 -6.382,-4.545 -6.562,-4.5 -10.063,-3.625 -11,-5 -17,-5 c -4.165,0 -5.439,4.407 -6.832,7.106 C -24.198,4.152 -25.199,8 -26,8 -26.61,8 -27.405,5.973 -27.933,3.938 -28.59,5.473 -29.447,7 -30,7 -30.711,7 -31.42,4.475 -31.771,2.294 -33.638,1.02 -35,-0.827 -35,-3 c 0,-3 7,-5 7,-5 2.118,-1.104 2.743,-2.767 3.305,-4.276 2.062,-6.384 1.814,-11.724 3.195,-11.724 1.381,0 2.5,3.357 2.5,7.5 0,0.212 -0.005,0.42 -0.011,0.627 3.155,0.101 6.755,1.075 9.79,0.293 1.36,-4.493 1.687,-8.42 2.721,-8.42 0.958,0 1.79,3.784 2.209,7.484 0.031,0.141 0.054,0.297 0.054,0.493 l 0.01,0.108 c 0.032,0.319 0.061,0.636 0.087,0.948 l 0.515,5.592 c 0,1.112 -0.254,2.217 -0.754,3.103 C -1.551,-5.221 0,-3.059 0,0"/></g><g transform="translate(8,23)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(3,22.625)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1,-0.625 -1,-2.625 -1.5,-2.625 -2,-2.625 -3,-1.449 -3,0 -3,1.45 1.229,0.769 0,0"/></g><g transform="translate(3.0005,19.5)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.184,0 -0.36,0.101 -0.448,0.276 -0.571,0.523 -0.471,0.824 -0.224,0.947 1.917,2.017 5.95,1.027 6.121,0.985 6.389,0.918 6.551,0.647 6.484,0.379 6.418,0.112 6.146,-0.048 5.878,0.015 5.84,0.025 2.032,0.957 0.223,0.053 0.151,0.017 0.075,0 0,0"/></g><g transform="translate(7.9995,17.5)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.095,0 -0.191,0.027 -0.277,0.084 -0.306,0.104 -3.175,2 -5,2 -5.276,2 -5.5,2.224 -5.5,2.5 -5.5,2.776 -5.276,3 -5,3 -2.873,3 0.15,1.001 0.278,0.916 0.507,0.763 0.57,0.453 0.417,0.223 0.32,0.078 0.162,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M36 12c0-4.252-3.141-7-8-7-.553 0-1 .448-1 1s.447 1 1 1c1.804 0 6 .487 6 5 0 2.881-1.851 4.172-4.054 4.692-.164-.073-.328-.147-.509-.192C25.938 15.625 25 17 19 17c-4.165 0-5.439-4.407-6.832-7.106C11.802 7.848 10.801 4 10 4c-.61 0-1.405 2.027-1.933 4.062C7.41 6.527 6.553 5 6 5c-.711 0-1.42 2.525-1.771 4.706C2.362 10.981 1 12.827 1 15c0 3 7 5 7 5 2.118 1.104 2.743 2.767 3.305 4.276C13.367 30.66 13.119 36 14.5 36s2.5-3.357 2.5-7.5c0-.212-.005-.42-.011-.627 3.154-.101 6.755-1.075 9.79-.293C28.139 32.073 28.466 36 29.5 36c.958 0 1.79-3.784 2.209-7.484.031-.141.054-.297.054-.492l.01-.108c.032-.319.062-.636.088-.948l.515-5.592c0-1.112-.254-2.217-.754-3.103C34.449 17.221 36 15.059 36 12z"/><circle fill="#292F33" cx="7" cy="13" r="1"/><path fill="#292F33" d="M3 13.375C2 14 2 16 1.5 16S0 14.824 0 13.375c0-1.45 4.229-.769 3 0z"/><path fill="#662113" d="M3 16.5c-.184 0-.36-.101-.448-.276-.124-.247-.023-.547.224-.671 2.141-1.07 6.174-.08 6.345-.038.268.067.431.338.364.606-.067.267-.339.427-.606.364-.039-.01-3.847-.942-5.655-.038-.072.036-.148.053-.224.053z"/><path fill="#662113" d="M8 18.5c-.095 0-.191-.027-.277-.084C7.694 18.396 4.824 16.5 3 16.5c-.276 0-.5-.224-.5-.5s.224-.5.5-.5c2.127 0 5.15 1.999 5.277 2.084.229.153.292.463.139.693-.096.145-.255.223-.416.223z"/></svg> \ No newline at end of file |