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-1f3fb-200d-1f373.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-1f3fb-200d-1f373.svg')
-rw-r--r-- | public/emoji/1f468-1f3fb-200d-1f373.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-1f3fb-200d-1f373.svg b/public/emoji/1f468-1f3fb-200d-1f373.svg index 80e793c79..a972e6a4b 100644 --- a/public/emoji/1f468-1f3fb-200d-1f373.svg +++ b/public/emoji/1f468-1f3fb-200d-1f373.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(36,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(22,0)" id="g24"><path id="path26" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 5,8 -5,8 0,0 Z"/></g><g transform="translate(17.6396,7.9619)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.962 8.72,-1.962 8.72,0 l 0,3.749 L 0,3.749 0,0 Z"/></g><g transform="translate(17.6318,10.0273)" id="g32"><path id="path34" style="fill:#eec2ad;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(15.4443,20.0645)" id="g36"><path id="path38" style="fill:#f7dece;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,20.0645)" id="g40"><path id="path42" style="fill:#f7dece;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,19.0405)" id="g44"><path id="path46" style="fill:#f7dece;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,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(22,32.5205)" id="g52"><path id="path54" style="fill:#292f33;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,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(26,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(22.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(31.1777,24)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.622,-1 -9.178,-1 -6.555,0 -9.177,1 -9.177,1 l 0,6 L 0,6 0,0 Z"/></g><g transform="translate(16,24.75)" id="g72"><path id="path74" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(29,24.75)" id="g76"><path id="path78" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(19,24.3501)" id="g80"><path id="path82" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(22.5,24.25)" id="g84"><path id="path86" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(26,24.3501)" id="g88"><path id="path90" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(28.25,36)" id="g92"><path id="path94" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.157,0 -2.237,-0.32 -3.167,-0.869 -4.097,-0.32 -5.177,0 -6.334,0 -7.456,0 -8.507,-0.3 -9.417,-0.818 -10.327,-0.3 -11.378,0 -12.5,0 c -3.452,0 -6.25,-2.798 -6.25,-6.25 0,-3.452 11.294,-3.25 12.416,-3.25 1.157,0 12.584,-0.202 12.584,3.25 C 6.25,-2.798 3.451,0 0,0"/></g><g transform="translate(10,11.25)" id="g96"><path id="path98" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-3.452 -2.015,-5.25 -4.5,-5.25 -6.985,-5.25 -9,-3.452 -9,0 -9,3.452 -6.985,7.25 -4.5,7.25 -2.015,7.25 0,3.452 0,0"/></g><path id="path100" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 6.5,0 -2,0 0,8 2,0 0,-8 z"/><g transform="translate(10,11.25)" id="g102"><path id="path104" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-3.452 -2.015,-5.25 -4.5,-5.25 -6.985,-5.25 -9,-3.452 -9,0 -9,3.452 -6.985,7.25 -4.5,7.25 -2.015,7.25 0,3.452 0,0"/></g><path id="path106" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 6.5,0 -2,0 0,8 2,0 0,-8 z"/><g transform="translate(14.8945,31.5112)" id="g108"><path id="path110" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.036,-0.008 0.071,-0.011 0.106,-0.011 0.231,0 0.438,0.16 0.488,0.394 0.032,0.145 0.335,1.441 1.32,2.212 0.76,0.596 1.748,0.987 2.007,1.084 C 3.524,3.904 3.097,4.08 2.653,4.214 2.23,4.005 1.739,3.728 1.297,3.382 0.062,2.415 -0.319,0.89 -0.383,0.594 -0.441,0.324 -0.27,0.058 0,0"/></g><g transform="translate(27.0508,34.0972)" id="g112"><path id="path114" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.986,-0.772 1.289,-2.066 1.319,-2.212 0.051,-0.234 0.258,-0.394 0.49,-0.394 0.034,0 0.069,0.003 0.105,0.011 0.27,0.058 0.441,0.324 0.384,0.594 C 2.233,-1.706 1.855,-0.182 0.617,0.787 0.191,1.12 -0.279,1.389 -0.691,1.596 -1.125,1.456 -1.542,1.279 -1.929,1.054 -1.593,0.923 -0.703,0.55 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M36 36v-2c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#269" d="M22 36l5-8H17z"/><path fill="#F7DECE" d="M17.64 28.038c0 1.962 8.72 1.962 8.72 0v-3.749h-8.72v3.749z"/><path fill="#EEC2AD" d="M17.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="#F7DECE" d="M15.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="#F7DECE" d="M13.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 27.08 22 27.08c-4.706 0-8.523-4.531-8.523-10.121"/><path fill="#C1694F" d="M22 23.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="#292F33" d="M22 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.473C12.822 7.648 15.646 3.48 22 3.48"/><path fill="#662113" d="M18 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="M22.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="#CCD6DD" d="M31.178 12S28.556 13 22 13s-9.178-1-9.178-1V6h18.355v6z"/><path fill="#99AAB5" d="M16 11.25c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3zm13 0c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3zm-10 .4c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3zm3.5.1c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3zm3.5-.1c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3z"/><path fill="#E1E8ED" d="M28.25 0c-1.157 0-2.237.32-3.167.869C24.153.32 23.073 0 21.916 0c-1.122 0-2.173.3-3.083.818C17.923.3 16.872 0 15.75 0 12.298 0 9.5 2.798 9.5 6.25S20.794 9.5 21.916 9.5c1.157 0 12.584.202 12.584-3.25S31.701 0 28.25 0z"/><path fill="#99AAB5" d="M10 24.75C10 28.202 7.985 30 5.5 30S1 28.202 1 24.75s2.015-7.25 4.5-7.25 4.5 3.798 4.5 7.25z"/><path fill="#99AAB5" d="M4.5 28h2v8h-2z"/><path fill="#C1694F" d="M10 24.75C10 28.202 7.985 30 5.5 30S1 28.202 1 24.75s2.015-7.25 4.5-7.25 4.5 3.798 4.5 7.25z"/><path fill="#C1694F" d="M4.5 28h2v8h-2z"/><path fill="#CCD6DD" d="M14.894 4.489c.036.008.071.011.106.011.231 0 .438-.16.488-.394.031-.145.334-1.441 1.319-2.212.76-.595 1.749-.987 2.007-1.084-.396-.225-.824-.4-1.268-.535-.423.21-.914.486-1.355.832-1.236.967-1.617 2.492-1.681 2.788-.057.27.115.536.384.594zm12.157-2.586c.986.772 1.289 2.066 1.319 2.211.051.235.258.395.489.395.034 0 .069-.003.105-.011.27-.058.441-.324.384-.594-.064-.296-.443-1.82-1.681-2.789-.426-.333-.896-.602-1.309-.809-.434.139-.851.317-1.237.542.337.132 1.227.504 1.93 1.055z"/></svg> \ No newline at end of file |