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/1f3ed.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/1f3ed.svg')
-rw-r--r-- | public/emoji/1f3ed.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3ed.svg b/public/emoji/1f3ed.svg index 2303b92e1..04ee16260 100644 --- a/public/emoji/1f3ed.svg +++ b/public/emoji/1f3ed.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="clipPath100" clipPathUnits="userSpaceOnUse"><path id="path102" 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 transform="translate(10.3077,27)" id="g12"><path id="path14" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.615,0 -4.769,-2 0.154,-2 0,0 Z"/></g><g transform="translate(10,31)" id="g16"><path id="path18" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,0 -4.154,-2 0.154,-2 0,0 Z"/></g><g transform="translate(10.6154,23)" id="g20"><path id="path22" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5.231,0 -5.385,-2 0.154,-2 0,0 Z"/></g><g transform="translate(5.0769,18.9999)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.077,-1 6,0 L 5.846,0 0,0 Z"/></g><g transform="translate(20.6154,23)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5.231,0 -5.385,-2 0.154,-2 0,0 Z"/></g><g transform="translate(15.0768,18.9999)" id="g32"><path id="path34" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.076,-1 5.923,-1 5.846,0 0,0 Z"/></g><g transform="translate(20.3077,27)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.615,0 -4.769,-2 0.154,-2 0,0 Z"/></g><g transform="translate(20,31)" id="g40"><path id="path42" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,0 -4.154,-2 0.154,-2 0,0 Z"/></g><g transform="translate(30.3077,27)" id="g44"><path id="path46" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.615,0 -4.769,-2 0.154,-2 0,0 Z"/></g><g transform="translate(25.0767,18.9999)" id="g48"><path id="path50" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.077,-1 6,0 L 5.846,0 0,0 Z"/></g><g transform="translate(30.6154,23)" id="g52"><path id="path54" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5.231,0 -5.385,-2 0.154,-2 0,0 Z"/></g><g transform="translate(30,31)" id="g56"><path id="path58" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,0 -4.154,-2 0.154,-2 0,0 Z"/></g><g transform="translate(10.4615,25)" id="g60"><path id="path62" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.923,0 -5.077,-2 0.154,-2 0,0 Z"/></g><g transform="translate(10.1539,29)" id="g64"><path id="path66" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.308,0 -4.462,-2 0.154,-2 0,0 Z"/></g><g transform="translate(5.2308,21)" id="g68"><path id="path70" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.154,-2 5.692,-2 5.538,0 0,0 Z"/></g><g transform="translate(20.4615,25)" id="g72"><path id="path74" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.923,0 -5.077,-2 0.154,-2 0,0 Z"/></g><g transform="translate(20.1539,29)" id="g76"><path id="path78" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.308,0 -4.462,-2 0.154,-2 0,0 Z"/></g><g transform="translate(15.2308,21)" id="g80"><path id="path82" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.154,-2 5.692,-2 5.538,0 0,0 Z"/></g><g transform="translate(30.4615,25)" id="g84"><path id="path86" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.923,0 -5.077,-2 0.154,-2 0,0 Z"/></g><g transform="translate(30.7692,21)" id="g88"><path id="path90" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5.538,0 -5.692,-2 0.154,-2 0,0 Z"/></g><g transform="translate(30.1539,29)" id="g92"><path id="path94" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.308,0 -4.462,-2 0.154,-2 0,0 Z"/></g><g id="g96"><g clip-path="url(#clipPath100)" id="g98"><g transform="translate(35,2)" id="g104"><path id="path106" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -30,0 c -1.104,0 -2,0.895 -2,2 l 0,14 c 0,1.105 0.896,2 2,2 l 30,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><path id="path108" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,14 -34,0 0,2 34,0 0,-2 z"/><path id="path110" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,8 -4,0 0,4 4,0 0,-4 z"/><path id="path112" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,8 -4,0 0,4 4,0 0,-4 z"/><path id="path114" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,8 -4,0 0,4 4,0 0,-4 z"/><path id="path116" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,2 6,2 6,6 10,6 10,2 Z"/><path id="path118" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,2 -4,0 0,4 4,0 0,-4 z"/><path id="path120" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,2 -4,0 0,4 4,0 0,-4 z"/><g transform="translate(9,36)" id="g122"><path id="path124" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.896 -2,-2 0,-0.457 0.159,-0.873 0.417,-1.209 C -1.83,-3.392 -2,-3.67 -2,-4 c 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 1.105,0 2,0.896 2,2 0,1.104 -0.895,2 -2,2"/></g><g transform="translate(19,36)" id="g126"><path id="path128" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.896 -2,-2 0,-0.457 0.159,-0.873 0.417,-1.209 C -1.83,-3.392 -2,-3.67 -2,-4 c 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 1.105,0 2,0.896 2,2 0,1.104 -0.895,2 -2,2"/></g><g transform="translate(29,36)" id="g130"><path id="path132" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.896 -2,-2 0,-0.457 0.159,-0.873 0.417,-1.209 C -1.83,-3.392 -2,-3.67 -2,-4 c 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 1.105,0 2,0.896 2,2 0,1.104 -0.895,2 -2,2"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BE1931" d="M10.308 9H5.692l-.154 2h4.924zM10 5H6l-.154 2h4.308zm.615 8h-5.23l-.154 2h5.538zM5 18h6l-.077-1H5.077zm15.615-5h-5.23l-.154 2h5.538zM15 18h6l-.077-1h-5.846zm5.308-9h-4.616l-.154 2h4.924zM20 5h-4l-.154 2h4.308zm10.308 4h-4.616l-.154 2h4.924zm-5.231 8L25 18h6l-.077-1zm5.538-4h-5.23l-.154 2h5.538zM30 5h-4l-.154 2h4.308z"/><path fill="#E6E7E8" d="M10.462 11H5.538l-.153 2h5.23zm-.308-4H5.846l-.154 2h4.616zm-4.923 8l-.154 2h5.846l-.154-2zm15.231-4h-4.924l-.153 2h5.23zm-.308-4h-4.308l-.154 2h4.616zm-4.923 8l-.154 2h5.846l-.154-2zm15.231-4h-4.924l-.153 2h5.23zm.307 4h-5.538l-.154 2h5.846zm-.615-8h-4.308l-.154 2h4.616z"/><path fill="#A0041E" d="M35 34c0 1.104-.896 2-2 2H3c-1.104 0-2-.896-2-2V20c0-1.104.896-2 2-2h30c1.104 0 2 .896 2 2v14z"/><path fill="#C1694F" d="M1 20h34v2H1z"/><path fill="#AAB8C2" d="M6 24h4v4H6zm10 0h4v4h-4zm10 0h4v4h-4zM6 30h4v4H6zm10 0h4v4h-4zm10 0h4v4h-4z"/><path fill="#D1D3D4" d="M9 0C7.896 0 7 .896 7 2c0 .457.159.873.417 1.209C7.17 3.392 7 3.67 7 4c0 .552.448 1 1 1s1-.448 1-1c1.104 0 2-.896 2-2s-.896-2-2-2zm10 0c-1.104 0-2 .896-2 2 0 .457.159.873.417 1.209C17.17 3.392 17 3.67 17 4c0 .552.448 1 1 1s1-.448 1-1c1.104 0 2-.896 2-2s-.896-2-2-2zm10 0c-1.104 0-2 .896-2 2 0 .457.159.873.417 1.209C27.17 3.392 27 3.67 27 4c0 .552.447 1 1 1s1-.448 1-1c1.104 0 2-.896 2-2s-.896-2-2-2z"/></svg> \ No newline at end of file |