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/1f468-1f3ff-200d-1f3a4.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/1f468-1f3ff-200d-1f3a4.svg')
-rw-r--r-- | public/emoji/1f468-1f3ff-200d-1f3a4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-1f3ff-200d-1f3a4.svg b/public/emoji/1f468-1f3ff-200d-1f3a4.svg index 28d5059ed..505ac44fd 100644 --- a/public/emoji/1f468-1f3ff-200d-1f3a4.svg +++ b/public/emoji/1f468-1f3ff-200d-1f3a4.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 14,10 C 10.687,10 8,7.314 8,4 l 0,0 0,-4 28,0 0,4 c 0,3.314 -2.686,6 -6,6 l 0,0 -16,0 z"/></clipPath><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" 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,0)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-4 28,0 z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(15.6816,11.5)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4.818,-12 -8.304,-12 -8.5,-1 0,0 Z"/></g><g transform="translate(15,12)" id="g36"><path id="path38" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,-6 3,-1 -2,-3 4,-5 c 0,0 -10.818,0.5 -10.818,1 l 0,14 L 0,0 Z"/></g><g transform="translate(7.6816,-1.6865)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.052,-0.242 5.182,-0.554 9.235,-0.761 L 5.7,3.66 7.539,6.419 4.686,7.37 6.625,13.187 0,13.187 0,0 Z m 11.399,-1.864 -1.104,0.052 C -1,-1.291 -1,-0.859 -1,-0.313 l 0,14.5 9.012,0 L 5.951,8.003 9.098,6.954 6.937,3.714 11.399,-1.864 Z"/></g><g transform="translate(28.5,11)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.818,-12 8.305,-12 8.5,-1 0,0 Z"/></g><g transform="translate(29.5,11.5)" id="g48"><path id="path50" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.5,-6 -3,-1 2,-3 -4,-4.5 c 0,0 11,0.094 11,0.594 l 0,14 L 0,0 Z"/></g><g transform="translate(28.7793,4.2324)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.851,-2.776 -1.655,-6.72 c 4.104,0.054 8.286,0.209 9.376,0.41 l 0,13.165 L 1.359,6.775 2.818,0.939 0,0 Z m -3.901,-7.742 4.492,5.054 -2.15,3.223 3.182,1.061 -1.541,6.164 8.639,0.107 0,-14.506 c 0,-0.578 0,-0.996 -11.496,-1.093 l -1.126,-0.01 z"/></g></g></g><g id="g56"><g clip-path="url(#clipPath60)" id="g58"><g transform="translate(18.1816,10)" id="g64"><path id="path66" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.5,-3.5 4,-3.5 7.5,-3.5 8,0 8,0 L 8,4 0,4 0,0 Z"/></g><g transform="translate(18.1816,12)" id="g68"><path id="path70" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.216,-1.374 2.355,-1.719 3.996,-1.719 5.635,-1.719 6.783,-1.373 8,0 L 8,4 0,4 0,0 Z"/></g><g transform="translate(15.626,22.0645)" id="g72"><path id="path74" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(32.0146,22.0645)" id="g76"><path id="path78" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(13.6592,21.0405)" id="g80"><path id="path82" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.522,10.121 4.708,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.815,-10.121 -8.523,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(22.1816,14.1982)" id="g84"><path id="path86" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(22.1816,34.5205)" id="g88"><path id="path90" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(18.1816,21)" id="g92"><path id="path94" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(26.1816,21)" id="g96"><path id="path98" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22.9316,18.25)" id="g100"><path id="path102" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(15,14.5928)" id="g104"><path id="path106" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.901 -1.541,-3.442 -3.442,-3.442 -1.901,0 -3.442,1.541 -3.442,3.442 0,1.901 1.541,3.442 3.442,3.442 C -1.541,3.442 0,1.901 0,0"/></g><g transform="translate(13.4053,11.2676)" id="g108"><path id="path110" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.168,-0.168 -0.441,-0.168 -0.608,0 l -4.564,4.564 c -0.168,0.168 -0.168,0.44 0,0.608 l 0.608,0.609 c 0.168,0.168 0.441,0.168 0.609,0 L 0.608,1.217 c 0.168,-0.168 0.168,-0.441 0,-0.609 L 0,0 Z"/></g><g transform="translate(1.0273,3.248)" id="g112"><path id="path114" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.69,-0.42 1.705,-0.305 2.431,0.324 l 6.861,6.269 c 0.417,0.362 0.44,0.969 0.051,1.358 l -2.162,2.164 c -0.39,0.389 -0.998,0.366 -1.36,-0.051 L -0.333,3.088 C -0.942,2.384 -1.063,1.411 -0.688,0.723"/></g><g transform="translate(2,22.7236)" id="g116"><path id="path118" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-4.062 C 0,-4.023 -0.324,-4 -0.501,-4 c -0.828,0 -1.5,-0.447 -1.5,-1 0,-0.552 0.672,-1 1.5,-1 C 0.328,-6 1,-5.552 1,-5 l 0,0 0,3.056 2,-1.112 0,-2.506 C 3,-5.523 2.926,-5.5 2.749,-5.5 c -0.828,0 -1.375,-0.447 -1.375,-1 0,-0.552 0.487,-1.042 1.313,-1.112 C 4,-7.724 4,-6.724 4,-6.724 L 4,-2.223 0,0 Z"/></g><g transform="translate(9,26)" id="g120"><path id="path122" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.838 c -0.158,0.037 -0.324,0.062 -0.5,0.062 -0.829,0 -1.5,-0.448 -1.5,-1 0,-0.552 0.671,-1 1.5,-1 0.828,0 1.5,0.448 1.5,1 L 1,0 0,0 Z"/></g><path id="path124" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 4.458,7.5 2,0 0,-7.5 -2,0 0,7.5 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C543E" d="M13.6 26h16v10h-16z"/><path fill="#292F33" d="M29.6 26v10h6v-4c0-3.314-2.685-6-6-6zm-16 0c-3.313 0-6 2.686-6 6v4h6V26z"/><path fill="#8CC6EB" d="M21.783 36h9.001l5.083-6.925s-3.333-3.729-9.771-4.95c0 1.304.988 3.337.988 3.337l-5.301 7.006V36z"/><path fill="#8CC6EB" d="M21.783 36h-9.001l-5.083-6.925s3.333-3.729 9.771-4.95c0 1.304-.988 3.337-.988 3.337l5.301 7.006V36z"/><path fill="#1D6398" d="M33.534 27.094s-2.453-1.665-4.656-2.447c-3.058-1.086-2.375 1.939-2.375 1.939s-3.82 6.429-4.72 7.883c0-.001 7.034-5.535 11.751-7.375zm-23.502 0s2.453-1.665 4.656-2.447c3.058-1.086 2.375 1.939 2.375 1.939s3.82 6.429 4.72 7.883c0-.001-7.035-5.535-11.751-7.375z"/><path fill="#4191CE" d="M21.784 34.563s7.333-7.479 12.125-8.354c-4.083-3.417-10.125-3.042-10.125-3.042 0 1.224 1.988 1.368 1.988 2.882 0 2.485-3.09 6.703-3.989 8.067l.001.447z"/><path fill="#4191CE" d="M21.782 34.563s-7.333-7.479-12.125-8.354c4.083-3.417 10.125-3.042 10.125-3.042 0 1.224-1.988 1.368-1.988 2.882 0 2.485 3.09 6.703 3.989 8.067l-.001.447z"/><path fill="#7C543E" d="M17.782 26s.5 3.5 4 3.5 4-3.5 4-3.5v-4h-8v4z"/><path fill="#674232" d="M17.782 24c1.216 1.374 2.355 1.719 3.996 1.719 1.639 0 2.787-.346 4.004-1.719v-1.625h-8V24z"/><path fill="#7C543E" d="M30.057 12.577c.132-.625.214-1.508.214-2.634 0-3.212-3.264-7.067-8.489-7.067-5.877 0-8.489 3.855-8.489 7.067 0 .54.04.991.094 1.402-.809.16-1.438 1.253-1.438 2.591 0 1.33.621 2.417 1.423 2.587.077.59.199 1.163.358 1.714.044.152.096.298.146.447.228.683.51 1.332.851 1.932.197.346.415.672.645.987 1.559 2.127 3.848 3.477 6.411 3.477 4.707 0 8.523-4.531 8.523-10.121-.002-.822-.093-1.617-.249-2.382z"/><path fill="#DD2F45" d="M19.452 13.913l2.581-3.69-4.362-1.775-3.943 9.789c.044.152.096.298.146.447l1.963-.805-1.113 2.738c.197.346.415.672.645.987l6.879-8.304-2.796.613z"/><path fill="#3E2E24" d="M21.782 21.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.142.143-.987.848-3.741.848m.75-4.052h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path d="M25.782 15c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.451 1-1 1m-8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.451 1-1 1"/><path fill="#88C9F9" d="M31.492 8.021c.36.066.776.114 1.139.074-.602-.43-1.421-1.148-1.967-1.641-2.314-3.621-6.343-4.974-9.12-4.974-2.246 0-5.708 1.133-7.628 3.316S13.85 10 15.735 10.763c-.175-.924-.348-2.163-.194-3.17 1.022 1.039 2.682 2.078 5.319 2.574.391.122 1.878.647 3.063 1.885-.037-.761-.313-1.301-.529-1.616.295.012.574.034.887.034 2.285 0 3.816.985 4.446 2.888-.034.512-.19 1.771-.906 2.958.762-.248 1.185-.705 1.374-.96.494 1.429 1.717 2.622 1.717 2.622.562-3.938 2.094-4.135 1.226-7.964-.162-.719-.385-1.378-.646-1.993z"/><path fill="#424143" d="M10.363 20c-1.695 0-3.069 1.374-3.069 3.07 0 .478.119.925.314 1.328l-.232-.232c-.347-.347-.89-.327-1.212.045L.676 30.433c-.544.628-.798 1.643.011 2.452.809.809 1.807.574 2.454.013l.892-.815V36h1.784v-5.546l3.443-3.146c.372-.323.393-.865.045-1.211l-.271-.271c.404.196.851.315 1.33.315 1.696 0 3.07-1.374 3.07-3.07C13.433 21.374 12.058 20 10.363 20z"/><path fill="#59595C" d="M12.011 26.035c-.15.15-.393.15-.543 0l-4.07-4.07c-.15-.15-.15-.392 0-.542l.543-.543c.15-.15.393-.15.543 0l4.07 4.07c.15.15.15.393 0 .543l-.543.542z"/></svg> \ No newline at end of file |