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-1f3fd-200d-2708-fe0f.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-1f3fd-200d-2708-fe0f.svg')
-rw-r--r-- | public/emoji/1f468-1f3fd-200d-2708-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-1f3fd-200d-2708-fe0f.svg b/public/emoji/1f468-1f3fd-200d-2708-fe0f.svg index caf7f3dfd..dc52d245c 100644 --- a/public/emoji/1f468-1f3fd-200d-2708-fe0f.svg +++ b/public/emoji/1f468-1f3fd-200d-2708-fe0f.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,0 36,0 36,36 0,36 0,0 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(32,0)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(30,28.5)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.142 -5.372,-7.5 -12,-7.5 -6.627,0 -12,3.358 -12,7.5 0,4.142 5.373,7.5 12,7.5 C -5.372,7.5 0,4.142 0,0"/></g><g transform="translate(13.6396,7.8994)" id="g28"><path id="path30" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.268 2.848,-1.963 4.36,-1.963 1.512,0 2.616,0.696 4.36,1.963 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6318,10.0273)" id="g32"><path id="path34" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(11.4443,20.0645)" id="g36"><path id="path38" style="fill:#d5ab88;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(27.833,20.0645)" id="g40"><path id="path42" style="fill:#d5ab88;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(9.4775,19.0405)" id="g44"><path id="path46" style="fill:#d5ab88;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(18,12.1982)" id="g48"><path id="path50" style="fill:#c1694f;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(18,32.5205)" id="g52"><path id="path54" style="fill:#963b22;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(14,19)" id="g56"><path id="path58" style="fill:#662113;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,19)" id="g60"><path id="path62" style="fill:#662113;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(18.75,16.25)" id="g64"><path id="path66" style="fill:#c1694f;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(8.5,27)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 4.253,2 9.5,2 14.747,2 19,1.105 19,0 19,-1.105 14.747,-2 9.5,-2 4.253,-2 0,-1.105 0,0"/></g><g transform="translate(27.5,28)" id="g72"><path id="path74" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -19,0 0,3.446 C -19,3.446 -15.042,7 -9.5,7 -3.958,7 0,3.446 0,3.446 L 0,0 Z"/></g><g transform="translate(15,31)" id="g76"><path id="path78" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.792 1.343,1 3,1 4.657,1 6,2.792 6,0 6,-1.657 4.657,-2 3,-2 1.343,-2 0,-1.657 0,0"/></g><g transform="translate(16,31)" id="g80"><path id="path82" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.895,2 2,2 3.105,2 4,1.105 4,0 4,-1.105 3.105,-2 2,-2 0.895,-2 0,-1.105 0,0"/></g><g transform="translate(27.5,27)" id="g84"><path id="path86" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -19,0 c -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 L 0,1 C 0.275,1 0.5,0.775 0.5,0.5 0.5,0.225 0.275,0 0,0"/></g><g transform="translate(11.5781,6.9443)" id="g88"><path id="path90" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.926,-0.938 c -0.272,-0.043 -0.529,0.143 -0.572,0.416 l -0.157,0.988 c -0.043,0.27 0.144,0.528 0.416,0.571 l 5.926,0.939 C -0.041,2.019 0.216,1.831 0.259,1.561 L 0.416,0.572 C 0.459,0.301 0.272,0.044 0,0"/></g><g transform="translate(7.1338,6.2412)" id="g92"><path id="path94" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,-0.156 -1.301,1.818 -0.313,1.975 0,0 Z"/></g><g transform="translate(9.1089,6.5537)" id="g96"><path id="path98" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,-0.156 -1.301,1.819 -0.313,1.975 0,0 Z"/></g><g transform="translate(11.0845,6.8662)" id="g100"><path id="path102" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,-0.155 -1.301,1.819 -0.313,1.976 0,0 Z"/></g><g transform="translate(30.3477,6.0059)" id="g104"><path id="path106" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.926,0.939 c -0.272,0.043 -0.459,0.3 -0.416,0.573 l 0.157,0.986 c 0.043,0.273 0.3,0.459 0.573,0.416 L 0.313,1.976 C 0.584,1.933 0.772,1.676 0.729,1.403 L 0.572,0.416 C 0.529,0.145 0.272,-0.043 0,0"/></g><g transform="translate(25.9033,6.71)" id="g108"><path id="path110" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,0.156 -0.675,2.132 0.312,1.976 0,0 Z"/></g><g transform="translate(27.8789,6.3975)" id="g112"><path id="path114" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,0.155 -0.675,2.132 0.312,1.975 0,0 Z"/></g><g transform="translate(29.8545,6.084)" id="g116"><path id="path118" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,0.156 -0.676,2.133 0.312,1.976 0,0 Z"/></g><g transform="translate(18.001,5.1221)" id="g120"><path id="path122" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.381,-2.494 4.093,-2.778 4.249,-2.841 3.727,0.878 3.727,0.878 l -7.454,0 c 0,0 -0.524,-3.781 -0.232,-3.625 C -3.32,-2.404 0,0 0,0"/></g><g transform="translate(19.3125,2.5625)" id="g124"><path id="path126" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.375,0.625 0.531,0.906 0.183,0.329 0.453,1.571 0.453,1.571 l -2.187,0.961 c 0,0.007 -0.16,-0.005 -0.16,-0.005 L -1.547,3.391 -1.719,3.328 C -1.937,3.258 -1.625,3.32 -1.625,3.313 L -3.599,2.477 c 0,0 0.287,-1.242 0.47,-1.571 C -2.973,0.625 -2.601,0 -2.601,0 c 0,0 -0.753,-0.562 -1.035,-2.563 l 2.325,0 0.019,0 2.323,0 C 0.75,-0.969 0,0 0,0"/></g><g transform="translate(13.2915,9.375)" id="g128"><path id="path130" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.566,-0.566 4.71,-3.383 4.71,-3.383 0,0 -2.127,-1.242 -4.085,-3.534 -0.197,-0.23 -1.542,4.625 -1.583,5.709 C -0.97,-0.905 -0.271,0.271 0,0"/></g><g transform="translate(22.7305,9.375)" id="g132"><path id="path134" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -4.709,-3.383 -4.709,-3.383 0,0 2.126,-1.242 4.084,-3.534 0.196,-0.23 1.542,4.625 1.583,5.709 C 0.97,-0.905 0.271,0.271 0,0"/></g><g transform="translate(18.0156,5.3125)" id="g136"><path id="path138" style="fill:#323a3f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.39,0.022 1.543,-0.771 1.422,-1.25 0.961,-3.077 0.573,-2.641 0.031,-2.641 c -0.611,0 -0.964,-0.472 -1.39,1.313 C -1.452,-0.941 -0.562,-0.031 0,0"/></g><g transform="translate(20.0469,0)" id="g140"><path id="path142" style="fill:#323a3f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.024,0 c 0,0 0.542,2.167 2.019,2.167 C -0.528,2.167 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M32 36v-2c0-3.314-2.685-6-6-6H10c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#292F33" d="M30 7.5c0 4.142-5.372 7.5-12 7.5-6.627 0-12-3.358-12-7.5S11.373 0 18 0c6.628 0 12 3.358 12 7.5"/><path fill="#D5AB88" d="M13.64 28.101c1.744 1.268 2.848 1.963 4.36 1.963 1.512 0 2.616-.696 4.36-1.963V24.29h-8.72v3.811z"/><path fill="#CC9B7A" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.147-.373 4.364-1.746v-3.491h-8.728v3.491z"/><path fill="#D5AB88" d="M11.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#D5AB88" d="M9.477 16.959c0-5.589 3.816-10.121 8.522-10.121 4.708 0 8.523 4.532 8.523 10.121S22.707 27.08 17.999 27.08c-4.706 0-8.522-4.531-8.522-10.121"/><path fill="#C1694F" d="M18 23.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.645-.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-.141.143-.987.848-3.741.848"/><path fill="#963B22" d="M18 3.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C8.822 7.648 11.646 3.48 18 3.48"/><path fill="#662113" d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#C1694F" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#292F33" d="M8.5 9c0-1.105 4.253-2 9.5-2s9.5.895 9.5 2-4.253 2-9.5 2-9.5-.895-9.5-2"/><path fill="#66757F" d="M27.5 8h-19V4.554S12.458 1 18 1s9.5 3.554 9.5 3.554V8z"/><path fill="#FFAC33" d="M15 5c0-2.792 1.343-1 3-1s3-1.792 3 1c0 1.657-1.343 2-3 2s-3-.343-3-2"/><path fill="#FDCB58" d="M16 5c0-1.105.895-2 2-2s2 .895 2 2-.895 2-2 2-2-.895-2-2m11.5 4h-19c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h19c.275 0 .5.225.5.5s-.225.5-.5.5"/><path fill="#292F33" d="M11.578 29.056l-5.926.938c-.272.043-.529-.144-.572-.416l-.157-.988c-.043-.271.144-.528.416-.571l5.926-.938c.272-.043.529.145.572.415l.157.988c.043.271-.144.528-.416.572"/><path fill="#FDCB58" d="M5.834 27.94l.989-.157.312 1.974-.989.157zm1.973-.313l.987-.156.313 1.975-.988.157zm1.978-.313l.988-.155.31 1.976-.988.155z"/><path fill="#292F33" d="M30.348 29.994l-5.926-.939c-.272-.043-.459-.3-.416-.572l.157-.986c.043-.272.3-.459.572-.416l5.926.938c.271.043.459.3.416.572l-.157.987c-.043.272-.3.459-.572.416"/><path fill="#FDCB58" d="M24.916 29.135l.312-1.975.988.156-.313 1.975zm1.976.312l.31-1.976.989.155-.31 1.976zm1.975.315l.312-1.976.99.156-.313 1.976z"/><path fill="#99AAB5" d="M18.001 30.878s3.381 2.494 4.093 2.778c.156.063-.366-3.656-.366-3.656h-7.454s-.524 3.781-.232 3.625c.639-.343 3.959-2.747 3.959-2.747"/><path fill="#292F33" d="M19.312 33.438s.375-.625.531-.906c.183-.329.453-1.57.453-1.57L18.108 30c0-.007-.16.006-.16.006l-.184.042-.172.062c-.218.07.094.008.094.015l-1.974.837s.287 1.241.47 1.57c.156.281.528.906.528.906s-.753.562-1.035 2.563h4.668c-.281-1.595-1.031-2.563-1.031-2.563"/><path fill="#F5F8FA" d="M13.292 26.625c.566.566 4.709 3.383 4.709 3.383s-2.126 1.242-4.084 3.534c-.197.23-1.542-4.625-1.583-5.709-.012-.303.687-1.479.958-1.208m9.438 0c-.566.566-4.709 3.383-4.709 3.383s2.126 1.242 4.084 3.534c.196.23 1.542-4.625 1.583-5.709.012-.303-.687-1.479-.958-1.208"/><path fill="#323A3F" d="M18.016 30.688c.39-.022 1.543.771 1.422 1.25-.461 1.827-.849 1.391-1.391 1.391-.611 0-.964.473-1.39-1.312-.094-.388.797-1.298 1.359-1.329M20.047 36h-4.024s.542-2.167 2.019-2.167S20.047 36 20.047 36"/></svg> \ No newline at end of file |