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-200d-1f52c.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-200d-1f52c.svg')
-rw-r--r-- | public/emoji/1f468-200d-1f52c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-200d-1f52c.svg b/public/emoji/1f468-200d-1f52c.svg index 084d54a68..02a9e1217 100644 --- a/public/emoji/1f468-200d-1f52c.svg +++ b/public/emoji/1f468-200d-1f52c.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="clipPath104" clipPathUnits="userSpaceOnUse"><path id="path106" d="m 15,25 14,0 0,-5 -14,0 0,5 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:#ccd6dd;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 transform="translate(18,9)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,-4 8,0 8,5 0,5 0,0 Z"/></g><g transform="translate(18,12)" id="g28"><path id="path30" style="fill:#f9ca55;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.4443,22.0645)" id="g32"><path id="path34" style="fill:#ffdc5d;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(31.833,22.0645)" id="g36"><path id="path38" style="fill:#ffdc5d;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.4775,21.0405)" id="g40"><path id="path42" style="fill:#ffdc5d;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.522,-4.532 8.522,-10.121 0,-5.589 -3.815,-10.121 -8.522,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(22,14.1982)" id="g44"><path id="path46" 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(22,34.5205)" id="g48"><path id="path50" style="fill:#ffac33;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,21)" id="g52"><path id="path54" 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(26,21)" 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.75,18.25)" id="g60"><path id="path62" 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(2,0)" id="g64"><path id="path66" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,0 -2,2 0,0.179 0.117,0.896 1,2 l 4,5 0,5 c 0,0 -2,0 -2,2 0,2 2,2 2,2 l 5,0 c 0,0 2,0 2,-2 0,-2 -2,-2 -2,-2 L 8,9 12,4 C 13.153,2.559 13,2.134 13,2 13,0 11,0 11,0 L 0,0 Z"/></g><g transform="translate(0.5312,1.7813)" id="g68"><path id="path70" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.969,-1.312 13,-1.312 14,0.469 10.906,4.5 2.5,4.5 0,0.156"/></g><g transform="translate(8,25)" id="g72"><path id="path74" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(10,20)" id="g76"><path id="path78" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(7,21.5)" id="g80"><path id="path82" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(10,18)" id="g84"><path id="path86" style="fill:#a8bccc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c 0,0 -2,0 -2,-2 0,-2 2,-2 2,-2 l 0,-5 -4,-5 c -0.883,-1.104 -1,-1.821 -1,-2 0,-2 2,-2 2,-2 l 11,0 c 0,0 2,0 2,2 0,0.134 0.153,0.559 -1,2 l -4,5 0,5 c 0,0 2,0 2,2 C 2,0 0,0 0,0 M -0.008,-1 C 0.453,-1.013 1,-1.197 1,-2 1,-2.806 0.449,-2.988 0,-3 l -1,0 0,-1 0,-5 0,-0.351 0.219,-0.274 4,-5 c 0.732,-0.915 0.787,-1.249 0.787,-1.252 L 4,-15.959 4,-16 c 0,-0.806 -0.551,-0.988 -1,-1 l -10.988,0 c -0.462,0.012 -1.012,0.194 -1.013,0.966 0,0.005 0.063,0.51 0.782,1.409 l 4,5 L -4,-9.351 -4,-9 -4,-4 -4.014,-3.024 -4.988,-3 C -5.45,-2.988 -6,-2.806 -6,-2 c 0,0.806 0.55,0.988 1,1 l 4.992,0"/></g><g transform="translate(19.0586,0)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.059,9.219 c 0,0 1.411,-1.645 4,-1.645 2.59,0 4.219,1.645 4.219,1.645 L 5.937,0 3.021,0 0,0 Z"/></g><g transform="translate(18.0811,10.75)" id="g92"><path id="path94" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.566,-0.566 2.919,-10.75 2.919,-10.75 l -3.156,0 -1.704,2.562 1.704,2.835 -2.017,0.634 0.254,3.957 c 0,0 1.729,1.033 2,0.762"/></g><g transform="translate(25.9189,10.75)" id="g96"><path id="path98" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -2.919,-10.75 -2.919,-10.75 l 3.156,0 1.704,2.562 -1.704,2.835 2.017,0.634 L 2,-0.762 C 2,-0.762 0.271,0.271 0,0"/></g><g id="g100"><g id="g102"/><g id="g108"><g style="opacity:0.39999402" id="g110" clip-path="url(#clipPath104)"><g id="g112" transform="translate(15,22)"><path id="path114" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 14,0 0,-5 -7,0 -7,0 0,2 z"/></g></g></g></g><g transform="translate(29,22)" id="g116"><path id="path118" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.325 -0.852,-2 -3,-2 -1.539,0 -2.804,1 -4,1 -1.196,0 -2.461,-1 -4,-1 -2.148,0 -3,0.675 -3,2 l 0,3 14,0 0,-3 z m 0,3.999 -14.001,0 C -15.001,3.999 -15,3 -15,3 l 0,-4 c 0,-1.461 2.333,-2 4,-2 1.667,0 2.599,1 4,1 1.401,0 2.333,-1 4,-1 1.667,0 4,0.539 4,2 L 1,3 C 1,4.001 0,3.999 0,3.999"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M36 36v-4c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v4h28z"/><path fill="#FFDC5D" d="M18 27l4 4 4-4v-5h-8z"/><path fill="#F9CA55" d="M18 24c1.216 1.374 2.355 1.719 3.996 1.719 1.639 0 2.787-.346 4.004-1.719v-4h-8v4z"/><path fill="#FFDC5D" d="M15.444 13.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="#FFDC5D" d="M13.477 14.96c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 25.081 22 25.081c-4.706-.001-8.523-4.532-8.523-10.121"/><path fill="#C1694F" d="M22 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-.141.143-.987.848-3.741.848"/><path fill="#FFAC33" d="M22 1.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.473C12.822 5.648 15.646 1.48 22 1.48"/><path fill="#662113" d="M18 15c-.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="M22.75 17.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="#66757F" d="M19.059 36L18 26.781s1.41 1.645 4 1.645 4.219-1.645 4.219-1.645L24.996 36h-5.937z"/><path fill="#F5F8FA" d="M18.081 25.25C18.647 25.816 21 36 21 36h-3.156l-1.704-2.562 1.704-2.835-2.017-.634.254-3.957s1.729-1.033 2-.762m7.838 0C25.353 25.816 23 36 23 36h3.156l1.704-2.562-1.704-2.835 2.017-.634-.254-3.957s-1.729-1.033-2-.762"/><path opacity=".4" fill="#FFF" d="M14.753 10.75h14.5V16h-14.5z"/><path fill="#F5F8FA" d="M29 10H15c-1 0-1 1-1 1v4c0 1.461 2.333 2 4 2s2.599-1 4-1 2.333 1 4 1 4-.539 4-2v-4c0-1-1-1-1-1zm0 4c0 1.325-.852 2-3 2-1.539 0-2.804-1-4-1s-2.461 1-4 1c-2.148 0-3-.675-3-2v-3h14v3z"/><circle fill="#9266CC" cx="7" cy="11" r="1"/><circle fill="#9266CC" cx="9" cy="16" r="1"/><circle fill="#9266CC" cx="5.5" cy="14.5" r="1.5"/><path fill="#A8BCCC" d="M10 18H5s-2 0-2 2 2 2 2 2v5l-4 5c-.883 1.104-1 1.821-1 2 0 2 2 2 2 2h11s2 0 2-2c0-.134.153-.559-1-2l-4-5v-5s2 0 2-2-2-2-2-2z"/><path fill="#E1E8ED" d="M9 27.351V21h1c.449-.012 1-.194 1-1 0-.803-.547-.987-1.008-1H5c-.45.012-1 .194-1 1s.55.988 1.012 1l.975.024L6 27.351l-1.894 2.368 3.394 3.5 3.394-3.5L9 27.351z"/><path fill="#9266CC" d="M.999 34.034c.001.772.551.954 1.013.966H13c.449-.012 1-.194 1-1v-.041l.006-.082c0-.003-.055-.337-.787-1.252l-2.325-2.906H4.106l-2.325 2.906c-.719.899-.782 1.404-.782 1.409z"/></svg> \ No newline at end of file |