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/1f939-1f3fc.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/1f939-1f3fc.svg')
-rw-r--r-- | public/emoji/1f939-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f939-1f3fc.svg b/public/emoji/1f939-1f3fc.svg index 883eb1cde..11006e21b 100644 --- a/public/emoji/1f939-1f3fc.svg +++ b/public/emoji/1f939-1f3fc.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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(26.0172,9.0009)" id="g12"><path id="path14" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20.017,0 0,-9.001 23.999,0 0,9.835 L -0.017,0.836 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(14,9.001)" id="g24"><path id="path26" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.85,-2.064 3.55,-2.064 6.25,-2.064 7,0 7,0 L 6.976,3.9 0,4 0,0 Z"/></g><g transform="translate(14.0659,10.9707)" id="g28"><path id="path30" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.058,-1.207 2.049,-1.51 3.477,-1.51 1.426,0 2.426,0.304 3.484,1.51 l 0,3.515 L 0,3.515 0,0 Z"/></g><g transform="translate(11.8423,19.813)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.271 -0.639,-2.304 -1.426,-2.304 -0.788,0 -1.427,1.033 -1.427,2.304 0,1.272 0.639,2.305 1.427,2.305 C -0.639,2.305 0,1.272 0,0"/></g><g transform="translate(26.1016,19.813)" id="g36"><path id="path38" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.271 -0.638,-2.304 -1.424,-2.304 -0.789,0 -1.428,1.033 -1.428,2.304 0,1.272 0.639,2.305 1.428,2.305 C -0.638,2.305 0,1.272 0,0"/></g><g transform="translate(10.1304,18.9131)" id="g40"><path id="path42" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.911 3.32,8.893 7.416,8.893 4.095,0 7.415,-3.982 7.415,-8.893 0,-4.91 -3.32,-8.893 -7.415,-8.893 C 3.32,-8.893 0,-4.91 0,0"/></g><g transform="translate(17.5464,12.9014)" id="g44"><path id="path46" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.396,0 -3.132,0.62 -3.256,0.745 -0.222,0.225 -0.222,0.59 0,0.816 C -3.04,1.778 -2.694,1.783 -2.47,1.58 -2.425,1.548 -1.843,1.152 0,1.152 1.915,1.152 2.466,1.578 2.472,1.583 2.695,1.806 3.045,1.796 3.268,1.569 3.491,1.345 3.478,0.97 3.255,0.745 3.132,0.62 2.397,0 0,0"/></g><g transform="translate(17.5464,30.7573)" id="g48"><path id="path50" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.915,0 7.986,-3.663 7.986,-6.714 0,-3.051 -0.614,-4.272 -1.229,-3.051 -0.615,1.22 -1.228,2.44 -1.228,2.44 0,0 -3.687,0 -4.915,1.223 0,0 1.844,-3.663 -1.843,0 0,0 0.614,-2.443 -3.071,0.609 0,0 -1.844,-1.221 -2.457,-4.272 -0.171,-0.847 -1.229,0 -1.229,3.051 C -7.986,-3.663 -5.528,0 0,0"/></g><g transform="translate(14.0659,18.8779)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.479,0 -0.87,0.395 -0.87,0.878 l 0,0.879 c 0,0.483 0.391,0.879 0.87,0.879 0.479,0 0.87,-0.396 0.87,-0.879 l 0,-0.879 C 0.87,0.395 0.479,0 0,0"/></g><g transform="translate(21.0273,18.8779)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.479,0 -0.87,0.395 -0.87,0.878 l 0,0.879 c 0,0.483 0.391,0.879 0.87,0.879 0.477,0 0.87,-0.396 0.87,-0.879 l 0,-0.879 C 0.87,0.395 0.477,0 0,0"/></g><g transform="translate(18.1992,16.4609)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.306,0 c -0.359,0 -0.652,0.296 -0.652,0.659 0,0.362 0.293,0.659 0.652,0.659 L 0,1.318 C 0.359,1.318 0.652,1.021 0.652,0.659 0.652,0.296 0.359,0 0,0"/></g><g transform="translate(5.8945,21.7949)" id="g64"><path id="path66" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.834,-1.39 -4.214,-6.221 0,0 -2.4,4.817 -0.522,10.15 L 0,0 Z"/></g><g transform="translate(20.0508,30.0229)" id="g68"><path id="path70" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.758,3.005 -7.363,1.497 0,0 3.523,4.069 9.168,4.386 L 0,0 Z"/></g><g transform="translate(29.2715,19.6631)" id="g72"><path id="path74" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.972,3.571 -0.923,7.457 0,0 4.978,-2.046 7.075,-7.296 L 0,0 Z"/></g><g transform="translate(8.103,25.0137)" id="g76"><path id="path78" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><g transform="translate(26.0156,32.5)" id="g80"><path id="path82" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(35.8955,18.1455)" id="g84"><path id="path86" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.933 -7,0 -7,1.933 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(32.6455,12.5117)" id="g88"><path id="path90" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.111,0.538 -0.634,0.884 -1.169,0.774 l -2.057,-0.43 -1.808,0 c -0.85,0 -1.538,-0.696 -1.538,-1.555 l 0,-0.776 0,-0.777 3.846,0 c 0.83,0 1.503,0.666 1.533,1.496 l 0.273,0.057 0.503,0 c 0,0.059 -0.022,0.113 -0.035,0.169 C -0.11,-0.827 0.085,-0.421 0,0"/></g><g transform="translate(36.0752,12.0791)" id="g92"><path id="path94" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.429 -0.344,0.776 -0.77,0.776 L -5.386,0 -9.232,0 c -0.426,0 -0.77,-0.349 -0.77,-0.778 l -0.073,-1.551 1.611,-0.002 3.078,0 4.616,1.553 C -0.77,-0.778 0,-0.43 0,0"/></g><g transform="translate(3.4302,8.7637)" id="g96"><path id="path98" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.11,0.538 0.633,0.884 1.168,0.774 l 2.058,-0.43 1.807,0 c 0.85,0 1.539,-0.696 1.539,-1.555 l 0,-0.776 0,-0.777 -3.847,0 c -0.829,0 -1.503,0.666 -1.532,1.496 l -0.273,0.057 -0.503,0 c 0,0.059 0.022,0.113 0.035,0.169 C 0.11,-0.827 -0.085,-0.421 0,0"/></g><g transform="translate(0,8.3311)" id="g100"><path id="path102" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.429 0.344,0.776 0.769,0.776 L 5.386,0 9.233,0 c 0.425,0 0.769,-0.349 0.769,-0.778 l 0,-1.553 -1.539,0 -3.077,0 -4.617,1.553 C 0.769,-0.778 0,-0.43 0,0"/></g><path id="path104" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,6 -1,0 0,-6 1,0 0,6 z"/><path id="path106" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,9 -1,0 0,-9 1,0 0,9 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M26 26.163l.017.836H6V36h24v-9.835z"/><path fill="#F3D2A2" d="M14 26.999s.85 2.063 3.55 2.063S21 26.999 21 26.999l-.024-3.9-6.976-.1v4z"/><path fill="#E2C196" d="M14.066 25.029c1.058 1.207 2.049 1.51 3.477 1.51 1.426 0 2.426-.304 3.485-1.51v-3.515h-6.961v3.515z"/><path fill="#F3D2A2" d="M11.842 16.187c0 1.271-.639 2.304-1.426 2.304-.788 0-1.426-1.033-1.426-2.304 0-1.272.639-2.305 1.426-2.305.788 0 1.426 1.033 1.426 2.305m14.26 0c0 1.271-.638 2.304-1.424 2.304-.789 0-1.428-1.033-1.428-2.304 0-1.272.639-2.305 1.428-2.305.786 0 1.424 1.033 1.424 2.305"/><path fill="#F3D2A2" d="M10.13 17.087c0-4.911 3.32-8.893 7.416-8.893 4.095 0 7.416 3.982 7.416 8.893 0 4.91-3.32 8.893-7.416 8.893-4.095-.001-7.416-3.983-7.416-8.893"/><path fill="#C1694F" d="M17.546 23.099c-2.396 0-3.132-.62-3.256-.745-.222-.225-.222-.59 0-.815.216-.218.562-.223.786-.019.045.032.627.428 2.47.428 1.914 0 2.466-.426 2.472-.431.223-.223.573-.213.796.014.223.225.21.6-.013.824-.122.124-.858.744-3.255.744"/><path fill="#FFE51E" d="M17.546 5.243c4.914 0 7.986 3.663 7.986 6.714 0 3.051-.614 4.273-1.229 3.051l-1.229-2.44s-3.686 0-4.915-1.223c0 0 1.845 3.663-1.843 0 0 0 .614 2.442-3.071-.609 0 0-1.843 1.221-2.457 4.272-.17.847-1.229 0-1.229-3.051.001-3.052 2.459-6.714 7.987-6.714"/><path fill="#662113" d="M14.066 17.122c-.478 0-.87-.395-.87-.878v-.879c0-.483.392-.878.87-.878.479 0 .87.395.87.878v.879c0 .483-.392.878-.87.878m6.961 0c-.479 0-.87-.395-.87-.878v-.879c0-.483.392-.878.87-.878.477 0 .87.395.87.878v.879c0 .483-.393.878-.87.878"/><path fill="#C1694F" d="M18.199 19.539h-1.306c-.36 0-.652-.296-.652-.659 0-.362.293-.659.652-.659h1.306c.359 0 .652.297.652.659.001.363-.292.659-.652.659"/><path fill="#D1D3D4" d="M5.895 14.205s-3.834 1.39-4.214 6.221c0 0-2.4-4.817-.522-10.149l4.736 3.928zm14.156-8.228s-2.758-3.005-7.363-1.497c0 0 3.522-4.069 9.167-4.387l-1.804 5.884zm9.22 10.36s1.972-3.571-.923-7.457c0 0 4.978 2.046 7.075 7.296l-6.152.161z"/><circle fill="#5C913B" cx="4.603" cy="10.986" r="3.5"/><circle fill="#BE1931" cx="22.516" cy="3.5" r="3.5"/><circle fill="#3B88C3" cx="32.396" cy="17.854" r="3.5"/><path fill="#E2C196" d="M32.646 23.488c-.111-.538-.634-.884-1.169-.774l-2.057.431h-1.809c-.85 0-1.538.695-1.538 1.555v1.552h3.847c.83 0 1.503-.666 1.532-1.496l.273-.057h.503c0-.059-.022-.113-.035-.169.342-.215.537-.621.453-1.042z"/><path fill="#F3D2A2" d="M36.075 23.921c0-.429-.344-.776-.77-.776l-4.616.776h-3.847c-.426 0-.77.349-.77.778L26 26.25l1.611.002h3.078l4.616-1.553c.001 0 .77-.348.77-.778z"/><path fill="#E2C196" d="M3.43 27.236c.11-.538.633-.884 1.168-.774l2.058.431h1.808c.85 0 1.539.695 1.539 1.555V30H6.155c-.83 0-1.503-.666-1.532-1.496l-.273-.057h-.503c0-.059.022-.113.036-.169-.343-.215-.538-.621-.453-1.042z"/><path fill="#F3D2A2" d="M0 27.669c0-.429.344-.776.769-.776l4.617.776h3.847c.425 0 .769.349.769.778V30H5.386L.769 28.447S0 28.099 0 27.669z"/><path fill="#5C913B" d="M10 30h1v6h-1zm15-3h1v9h-1z"/></svg> \ No newline at end of file |