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/1f477-1f3fe-200d-2642-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/1f477-1f3fe-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f477-1f3fe-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f477-1f3fe-200d-2642-fe0f.svg b/public/emoji/1f477-1f3fe-200d-2642-fe0f.svg index 902261cc2..4fa4d68c8 100644 --- a/public/emoji/1f477-1f3fe-200d-2642-fe0f.svg +++ b/public/emoji/1f477-1f3fe-200d-2642-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 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath94" clipPathUnits="userSpaceOnUse"><path id="path96" d="M 17.998,36 C 13,36 10.874,34.663 9,32 l 0,0 C 7.007,29.169 9,27 6,25 l 0,0 c -1.861,-1.24 6,-2.313 12,-2.313 l 0,0 c 6,0 13.861,1.073 12,2.313 l 0,0 c -3,2 -1.007,4.169 -3,7 l 0,0 c -1.873,2.663 -5,4 -9.002,4 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:#f2760f;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><path id="path24" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 23,5 13,5 13,9 23,9 23,5 Z"/><g transform="translate(14,9)" id="g26"><path id="path28" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 C 8,0 6.982,-7 4,-7 1.018,-7 0,0 0,0"/></g><g transform="translate(13.6396,5.9619)" id="g30"><path id="path32" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.745,-1.268 2.849,-1.963 4.36,-1.963 1.512,0 2.616,0.696 4.36,1.963 l 0,5.749 L 0,5.749 0,0 Z"/></g><g transform="translate(13.6318,10.0273)" id="g34"><path id="path36" style="fill:#9b6a49;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="g38"><path id="path40" style="fill:#af7e57;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.834,20.0645)" id="g42"><path id="path44" style="fill:#af7e57;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.906,0 -1.638,1.174 -1.638,2.622 0,1.448 0.732,2.623 1.638,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(9.4775,19.0405)" id="g46"><path id="path48" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.816,-10.121 -8.523,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(18,12.1982)" id="g50"><path id="path52" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.74,0.848 -0.257,0.256 -0.257,0.671 0,0.927 0.248,0.248 0.644,0.254 0.902,0.023 C -2.787,1.761 -2.117,1.311 0,1.311 c 2.201,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.5,2.044 3.756,1.786 4.012,1.53 3.998,1.104 3.742,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(18,32.5205)" id="g54"><path id="path56" style="fill:#60352a;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.705,-4.863 -1.412,-3.473 -0.705,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.235,0 -5.647,1.39 0,0 2.117,-4.168 -2.119,0 0,0 0.707,-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="g58"><path id="path60" style="fill:#60352a;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.551,3 1,2.55 1,2 L 1,1 C 1,0.45 0.551,0 0,0"/></g><g transform="translate(22,19)" id="g62"><path id="path64" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.549,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.549,3 0,3 0.551,3 1,2.55 1,2 L 1,1 C 1,0.45 0.551,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g66"><path id="path68" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.412,0 -0.75,0.337 -0.75,0.75 0,0.413 0.338,0.75 0.75,0.75 L 0,1.5 C 0.414,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.414,0 0,0"/></g><g transform="translate(30,25)" id="g70"><path id="path72" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,2 -1.008,4.169 -3,7 -1.873,2.663 -5,4 -9.002,4 C -17,11 -19.126,9.663 -21,7 c -1.992,-2.831 0,-5 -3,-7 -1.861,-1.24 6,-2.313 12,-2.313 6,0 13.861,1.073 12,2.313"/></g><g transform="translate(19,1.0625)" id="g74"><path id="path76" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-1.062 -1,1 0,3 2,0 L 0,0 Z"/></g><path id="path78" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 12,0 9,0 9,8 12,8 12,0 Z"/><path id="path80" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -3,0 0,8 3,0 0,-8 z"/><g transform="translate(11,8)" id="g82"><path id="path84" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1 1,-3 3,-5 4.582,-6.581 7,-8 7,-8 7,-4.937 6,-4 5,-3 4,-2 2,-1 2,1 2,2 0,0 0,0"/></g><g transform="translate(25,8)" id="g86"><path id="path88" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 -1,-3 -3,-5 -1.58,-1.581 -4,-3 -4,-3 0,3.063 1,4 2,5 1,1 3,2 3,4 0,1 2,-1 2,-1"/></g></g></g><g id="g90"><g clip-path="url(#clipPath94)" id="g92"><g transform="translate(16,24.5)" id="g98"><path id="path100" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 c -3.604,0 -10.687,1.035 -12.724,2.053 -0.247,0.123 -0.347,0.424 -0.223,0.671 0.124,0.247 0.424,0.346 0.671,0.223 C -10.983,2.05 -4.591,1.093 -1,1.006 L -1,11.5 C -1,11.776 -0.776,12 -0.5,12 -0.224,12 0,11.776 0,11.5 L 0,0 Z"/></g><g transform="translate(20.5,24.5)" id="g102"><path id="path104" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 0,11.5 c 0,0.276 0.224,0.5 0.5,0.5 0.276,0 0.5,-0.224 0.5,-0.5 L 0.5,1.004 C 5.042,1.076 14.513,2.065 16.276,2.947 16.524,3.069 16.823,2.971 16.947,2.724 17.07,2.477 16.971,2.176 16.724,2.053 14.603,0.993 3.941,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F2760F" d="M32 36v-2c0-3.314-2.685-6-6-6H10c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#292F33" d="M13 27h10v4H13z"/><path fill="#292F33" d="M14 27h8s-1.018 7-4 7-4-7-4-7"/><path fill="#AF7E57" d="M13.64 30.038c1.745 1.268 2.849 1.963 4.36 1.963s2.615-.696 4.359-1.963v-5.749h-8.72v5.749z"/><path fill="#9B6A49" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#AF7E57" d="M27.834 15.935c0-1.448-.734-2.623-1.639-2.623-.082 0-.161.02-.24.039C24.73 9.546 21.635 6.839 18 6.839s-6.729 2.707-7.955 6.512c-.079-.019-.158-.039-.24-.039-.905 0-1.639 1.175-1.639 2.623 0 1.33.621 2.417 1.423 2.587.634 4.845 4.153 8.557 8.411 8.557s7.777-3.712 8.411-8.557c.802-.17 1.423-1.257 1.423-2.587z"/><path fill="#915A34" d="M18 23.802c-2.754 0-3.6-.705-3.74-.848-.257-.256-.257-.671 0-.927.248-.248.644-.255.902-.023.051.037.721.487 2.838.487 2.201 0 2.836-.485 2.842-.49.256-.255.658-.243.914.015.256.256.242.683-.014.938-.142.143-.988.848-3.742.848"/><path fill="#60352A" d="M18 3.48c5.648 0 9.178 4.168 9.178 7.641s-.705 4.863-1.412 3.473l-1.412-2.778s-4.234 0-5.646-1.39c0 0 2.117 4.168-2.119 0 0 0 .707 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="#60352A" d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1 .551 0 1 .45 1 1v1c0 .55-.449 1-1 1m8 0c-.549 0-1-.45-1-1v-1c0-.55.451-1 1-1 .551 0 1 .45 1 1v1c0 .55-.449 1-1 1"/><path fill="#915A34" d="M18.75 19.75h-1.5c-.412 0-.75-.337-.75-.75s.338-.75.75-.75h1.5c.414 0 .75.337.75.75s-.336.75-.75.75"/><path fill="#292F33" d="M19 34.938l-1 1.061-1-1v-3h2z"/><path fill="#FFF75F" d="M9 28h3v8H9zm15 0h3v8h-3z"/><path fill="#55ACEE" d="M11 28c0 1 1 3 3 5 1.582 1.581 4 3 4 3 0-3.063-1-4-2-5s-3-2-3-4c0-1-2 1-2 1m14 0c0 1-1 3-3 5-1.58 1.581-4 3-4 3 0-3.063 1-4 2-5s3-2 3-4c0-1 2 1 2 1"/><path fill="#FFF75F" d="M30 11c-3-2-1.008-4.169-3-7-1.873-2.663-5-4-9.002-4C13 0 10.874 1.337 9 4c-1.992 2.831 0 5-3 7-1.861 1.24 6 2.313 12 2.313S31.861 12.24 30 11"/><path fill="#FFAC33" d="M16 11.5V.088c-.35.032-.683.074-1 .124v10.281c-2.09-.05-5.124-.396-7.653-.853-.174.297-.41.59-.73.877 2.91.566 6.596.983 8.883.983h.5zm12.855-1.553c-2.853.304-5.839.517-7.855.549V.292c-.323-.066-.66-.112-1-.155V11.5h.5c2.018 0 5.796-.261 9.289-.657-.402-.295-.708-.593-.934-.896z"/></svg> \ No newline at end of file |