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/1f371.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/1f371.svg')
-rw-r--r-- | public/emoji/1f371.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f371.svg b/public/emoji/1f371.svg index da1195afa..c4811840c 100644 --- a/public/emoji/1f371.svg +++ b/public/emoji/1f371.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(31,36)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -26,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-6 0,-16 0,-6 c 0,-2.209 1.791,-4 4,-4 l 26,0 c 2.209,0 4,1.791 4,4 l 0,6 0,16 0,6 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(14,25)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -1,0 c -2.209,0 -4,1.791 -4,4 l 0,2 c 0,2.209 1.791,4 4,4 l 1,0 C -1.791,6 0,4.209 0,2 L 0,0 Z"/></g><g transform="translate(22,9)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -15,0 c -1.104,0 -2,0.896 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 15,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(33,17)" id="g32"><path id="path34" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 -0.895,2 -2,2 L -7,2 C -8.104,2 -9,1.105 -9,0 l 0,-8 c 0,-1.104 0.896,-2 2,-2 l 5,0 c 1.105,0 2,0.896 2,2 l 0,8 z"/></g><g transform="translate(16,32)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.104 0.896,2 2,2 l 13,0 c 1.105,0 2,-0.896 2,-2 l 0,-9 c 0,-1.104 -0.895,-2 -2,-2 l -13,0 c -1.104,0 -2,0.896 -2,2 l 0,9 z"/></g><g transform="translate(14,23)" id="g40"><path id="path42" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -7,0 c -1.104,0 -2,0.896 -2,2 l 0,9 c 0,1.104 0.896,2 2,2 l 7,0 c 1.105,0 2,-0.896 2,-2 L 0,0 Z"/></g><g transform="translate(14,23)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -7,0 c -1.104,0 -2,0.896 -2,2 l 0,6 c 0,1.104 0.896,2 2,2 l 7,0 C -0.895,8 0,7.104 0,6 L 0,0 Z"/></g><g transform="translate(33,23)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -13,0 c -1.104,0 -2,0.896 -2,2 l 0,6 c 0,1.104 0.896,2 2,2 L -2,8 C -0.895,8 0,7.104 0,6 L 0,0 Z"/></g><g transform="translate(22,9)" id="g52"><path id="path54" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -15,0 c -1.104,0 -2,0.896 -2,2 l 0,5 c 0,1.105 0.896,2 2,2 L -2,7 C -0.895,7 0,6.105 0,5 L 0,0 Z"/></g><g transform="translate(33,9)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -5,0 c -1.104,0 -2,0.896 -2,2 l 0,5 c 0,1.105 0.896,2 2,2 l 5,0 C -0.895,7 0,6.105 0,5 L 0,0 Z"/></g><g transform="translate(27.0146,26.7598)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.315,-1.478 1.908,-3.098 1.322,-3.619 L 0.264,-4.56 c -0.585,-0.522 -2.126,0.255 -3.441,1.733 l -3.571,4.013 c -1.314,1.479 -1.907,3.099 -1.321,3.62 l 1.059,0.941 c 0.586,0.521 2.124,-0.255 3.439,-1.733 L 0,0 Z"/></g><g transform="translate(22.2803,24.9238)" id="g64"><path id="path66" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.598,-1.538 -1.477,-2.633 -1.961,-2.444 l -0.877,0.342 c -0.485,0.188 -0.392,1.588 0.205,3.125 l 1.625,4.178 c 0.599,1.538 1.477,2.633 1.962,2.444 L 1.83,7.304 C 2.315,7.115 2.224,5.715 1.625,4.177 L 0,0 Z"/></g><g transform="translate(23.1133,24.4639)" id="g68"><path id="path70" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.562,-0.535 -2.965,-0.568 -3.133,-0.076 l -0.305,0.891 c -0.168,0.492 0.962,1.324 2.523,1.858 l 4.242,1.45 C 4.889,4.656 6.291,4.69 6.46,4.197 L 6.764,3.308 C 6.933,2.815 5.803,1.983 4.241,1.45 L 0,0 Z"/></g><g transform="translate(6.4424,28.127)" id="g72"><path id="path74" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.373,4.106 4.907,0.961 7.135,-1.049 5.795,-2.534 -0.452,-4.979 0,0"/></g><g transform="translate(6.5845,28.2158)" id="g76"><path id="path78" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.739,1.737 3.293,-3.763 2.672,-6.698 0.716,-6.284 -4.534,-2.108 0,0"/></g><g transform="translate(5,28)" id="g80"><path id="path82" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.2,1.6 1,5 6,5 7,4 3,-4 0,0"/></g><g transform="translate(6,9)" id="g84"><path id="path86" style="fill:#b2c2cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 1,1 c 0.391,0.391 1.023,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 l -1,-1 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(18.417,8.501)" id="g88"><path id="path90" style="fill:#b2c2cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -1.001,1 c -0.39,0.391 -0.39,1.023 0,1.414 0.391,0.391 1.024,0.391 1.414,0 l 1.001,-1 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(12.2505,12.792)" id="g92"><path id="path94" style="fill:#b2c2cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.255,0 -0.511,0.098 -0.707,0.292 L -1.165,0.75 c -0.391,0.391 -0.392,1.023 -0.002,1.414 0.389,0.392 1.023,0.392 1.414,0.002 L 0.706,1.708 C 1.097,1.317 1.098,0.685 0.708,0.294 0.513,0.098 0.256,0 0,0"/></g><g transform="translate(32.1494,12.5879)" id="g96"><path id="path98" style="fill:#b26304;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.707,-0.848 0.592,-2.109 -0.257,-2.816 l -2.304,-1.921 c -0.848,-0.707 -2.11,-0.592 -2.817,0.257 l -1.921,2.304 c -0.707,0.848 -0.592,2.11 0.257,2.817 l 2.305,1.92 c 0.847,0.707 2.109,0.592 2.816,-0.256 L 0,0 Z"/></g><g transform="translate(32.1494,14.5879)" id="g100"><path id="path102" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.707,-0.848 0.592,-2.109 -0.257,-2.816 l -2.304,-1.921 c -0.848,-0.707 -2.11,-0.592 -2.817,0.257 l -1.921,2.304 c -0.707,0.848 -0.592,2.11 0.257,2.817 l 2.305,1.92 c 0.847,0.707 2.109,0.592 2.816,-0.256 L 0,0 Z"/></g><g transform="translate(13,10)" id="g104"><path id="path106" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><g transform="translate(21,14)" id="g108"><path id="path110" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M31 0H5C2.791 0 1 1.791 1 4v28c0 2.209 1.791 4 4 4h26c2.209 0 4-1.791 4-4V4c0-2.209-1.791-4-4-4z"/><path fill="#292F33" d="M14 11c0 2.209-1.791 4-4 4H9c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h1c2.209 0 4 1.791 4 4v2z"/><path fill="#BE1931" d="M22 27c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2v-8c0-1.104.896-2 2-2h15c1.104 0 2 .896 2 2v8zm11-8c0-1.104-.896-2-2-2h-5c-1.104 0-2 .896-2 2v8c0 1.104.896 2 2 2h5c1.104 0 2-.896 2-2v-8zM16 4c0-1.104.896-2 2-2h13c1.104 0 2 .896 2 2v9c0 1.104-.896 2-2 2H18c-1.104 0-2-.896-2-2V4zm-2 9c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2V4c0-1.104.896-2 2-2h7c1.104 0 2 .896 2 2v9z"/><path fill="#DD2E44" d="M14 13c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2V7c0-1.104.896-2 2-2h7c1.104 0 2 .896 2 2v6zm19 0c0 1.104-.896 2-2 2H18c-1.104 0-2-.896-2-2V7c0-1.104.896-2 2-2h13c1.104 0 2 .896 2 2v6z"/><path fill="#E1E8ED" d="M22 27c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2v-5c0-1.104.896-2 2-2h15c1.104 0 2 .896 2 2v5z"/><path fill="#DD2E44" d="M33 27c0 1.104-.896 2-2 2h-5c-1.104 0-2-.896-2-2v-5c0-1.104.896-2 2-2h5c1.104 0 2 .896 2 2v5z"/><path fill="#FFAC33" d="M27.015 9.24c1.315 1.478 1.908 3.098 1.322 3.619l-1.059.941c-.585.522-2.126-.255-3.44-1.733l-3.571-4.013c-1.314-1.479-1.907-3.099-1.321-3.62l1.059-.941c.586-.521 2.124.255 3.438 1.733l3.572 4.014z"/><path fill="#FFD983" d="M22.28 11.076c-.598 1.539-1.477 2.633-1.961 2.444l-.877-.341c-.485-.188-.393-1.588.205-3.126l1.625-4.178c.599-1.538 1.477-2.632 1.962-2.444l.876.341c.485.188.394 1.588-.205 3.126l-1.625 4.178z"/><path fill="#FFD983" d="M23.113 11.536c-1.562.535-2.965.568-3.133.076l-.305-.891c-.169-.492.962-1.324 2.522-1.858l4.242-1.45c1.562-.534 2.964-.567 3.133-.075l.304.89c.169.493-.961 1.325-2.523 1.858l-4.24 1.45z"/><path fill="#5C913B" d="M6.442 7.873c.373-4.106 4.907-.961 7.135 1.049-1.34 1.485-7.586 3.93-7.135-1.049z"/><path fill="#5C913B" d="M6.584 7.784c3.739-1.737 3.293 3.763 2.672 6.698-1.956-.414-7.206-4.59-2.672-6.698z"/><path fill="#77B255" d="M5 8c-1.2-1.6 1-5 6-5 1 1-3 9-6 5z"/><path fill="#B2C2CC" d="M6 27c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l1-1c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-1 1C6.512 26.902 6.256 27 6 27zm12.417.499c-.256 0-.512-.098-.707-.293l-1-1c-.391-.391-.391-1.024 0-1.414.391-.391 1.024-.391 1.415 0l1 1c.391.391.391 1.023 0 1.414-.196.195-.452.293-.708.293zm-6.167-4.291c-.255 0-.511-.098-.707-.292l-.459-.458c-.391-.391-.392-1.023-.002-1.414.389-.392 1.023-.392 1.415-.002l.459.458c.391.391.392 1.023.002 1.414-.195.196-.451.294-.708.294z"/><path fill="#B26304" d="M32.149 23.412c.707.848.592 2.109-.257 2.816l-2.305 1.921c-.848.707-2.109.592-2.816-.257l-1.921-2.305c-.707-.848-.592-2.109.257-2.816l2.305-1.921c.848-.707 2.109-.592 2.816.257l1.921 2.305z"/><path fill="#F4900C" d="M32.149 21.412c.707.848.592 2.109-.257 2.816l-2.305 1.921c-.848.707-2.109.592-2.816-.257l-1.921-2.305c-.707-.848-.592-2.109.257-2.816l2.305-1.921c.848-.707 2.109-.592 2.816.257l1.921 2.305z"/><circle fill="#CCD6DD" cx="12" cy="26" r="1"/><circle fill="#CCD6DD" cx="20" cy="22" r="1"/></svg> \ No newline at end of file |