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/1f649.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/1f649.svg')
| -rw-r--r-- | public/emoji/1f649.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f649.svg b/public/emoji/1f649.svg index db494cc26..377e0e6df 100644 --- a/public/emoji/1f649.svg +++ b/public/emoji/1f649.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 36,0 36,36 0,36 0,0 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,29)" id="g20"><path id="path22" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4.939 -6.772,4.457 -9.169,4.132 -11.602,5.921 -14.556,7 -18,7 -21.438,7 -24.388,5.919 -26.818,4.131 -29.203,4.456 -36,4.948 -36,0 c 0,-2.891 1.563,-4.732 2.433,-5.533 C -34.514,-8.26 -35,-11.175 -35,-14 c 0,-9.941 10,-13 17,-13 7,0 17,3 17,13 0,2.835 -0.483,5.751 -1.426,8.473 C -1.555,-4.722 0,-2.883 0,0"/></g><g transform="translate(30,22)" id="g24"><path id="path26" style="fill:#d79e84;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3.866 -3.134,7 -7,7 -8.96,7 -10.729,6.192 -12,4.895 -13.27,6.192 -15.04,7 -17,7 c -3.866,0 -7,-3.134 -7,-7 0,-3.777 2.993,-6.846 6.735,-6.986 C -18.938,-8.453 -20,-10.6 -20,-13 c 0,-4.419 3.581,-8 8,-8 4.419,0 8,3.581 8,8 0,2.4 -1.061,4.547 -2.734,6.014 C -2.992,-6.846 0,-3.777 0,0"/></g><g transform="translate(23.4258,7.2627)" id="g28"><path id="path30" style="fill:#642116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.092,0.147 -0.253,0.237 -0.426,0.237 l -10,0 c -0.173,0 -0.334,-0.09 -0.425,-0.237 -0.091,-0.147 -0.1,-0.331 -0.022,-0.486 0.087,-0.175 2.176,-4.277 5.447,-4.277 3.272,0 5.361,4.102 5.447,4.277 C 0.099,-0.331 0.091,-0.147 0,0"/></g><g transform="translate(19,10.5)" id="g32"><path id="path34" style="fill:#642116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,2 C -0.5,2.776 -0.276,3 0,3 0.276,3 0.5,2.776 0.5,2.5 l 0,-2 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(17,10.5)" id="g36"><path id="path38" style="fill:#642116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,2 C -0.5,2.776 -0.276,3 0,3 0.276,3 0.5,2.776 0.5,2.5 l 0,-2 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(15,20)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -0.895,-3 -2,-3 -1.104,0 -2,1.343 -2,3 0,1.657 0.896,3 2,3 1.105,0 2,-1.343 2,-3"/></g><g transform="translate(25,20)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -0.895,-3 -2,-3 -1.104,0 -2,1.343 -2,3 0,1.657 0.896,3 2,3 1.105,0 2,-1.343 2,-3"/></g><g transform="translate(30,20)" id="g48"><path id="path50" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,-20 6,-20 5,0 0,0 Z"/></g><g transform="translate(32,35)" id="g52"><path id="path54" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.905,0 -1.718,-0.368 -2.348,-1.064 -2.278,-2.518 -1.743,-9.038 -1.652,-9.989 0.004,-0.295 0.04,-1.732 0.405,-3.19 C -2.818,-17.348 -1.212,-18 0,-18 c 3.123,0 3.978,1.912 4,2.959 0.021,0.322 0.187,2.878 0.071,5.778 C 3.899,-4.955 3.225,-2.225 2.007,-0.917 1.448,-0.317 0.754,0 0,0"/></g><g transform="translate(32,34)" id="g56"><path id="path58" style="fill:#d79e84;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,0 3,-14 3,-14 0,0 0,-2 -3,-2 -3,0 -3,6 -3,6 0,0 -1,10 3,10"/></g><g transform="translate(32.999,28.5)" id="g60"><path id="path62" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.233,0 -0.442,0.165 -0.489,0.404 -0.695,1.451 -1.318,3 -1.999,3 l -2,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5 l 2,0 C -0.225,4 0.424,0.944 0.492,0.596 0.545,0.325 0.368,0.062 0.097,0.009 0.064,0.003 0.032,0 0,0"/></g><g transform="translate(6,20)" id="g64"><path id="path66" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2,-20 -8,0 1,20 5,0 z"/></g><g transform="translate(4,35)" id="g68"><path id="path70" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.754,0 -1.448,-0.317 -2.007,-0.917 -1.218,-1.308 -1.892,-4.038 -2.064,-8.346 -0.116,-2.9 0.05,-5.456 0.071,-5.778 0.022,-1.047 0.877,-2.959 4,-2.959 1.212,0 2.818,0.652 3.595,3.757 0.365,1.458 0.401,2.895 0.405,3.19 0.091,0.951 0.626,7.471 -1.652,9.989 C 1.718,-0.368 0.905,0 0,0"/></g><g transform="translate(4,34)" id="g72"><path id="path74" style="fill:#d79e84;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,0 3,-10 3,-10 0,0 0,-6 -3,-6 -3,0 -3,2 -3,2 0,0 -1,14 3,14"/></g><g transform="translate(3.0005,28.5)" id="g76"><path id="path78" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.032,0 -0.064,0.003 -0.096,0.009 -0.367,0.062 -0.544,0.325 -0.491,0.596 -0.423,0.944 0.225,4 2,4 L 4,4 C 4.276,4 4.5,3.776 4.5,3.5 4.5,3.224 4.276,3 4,3 L 2,3 C 1.25,3 0.649,1.217 0.49,0.404 0.444,0.165 0.234,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse transform="rotate(-14.3 5.8 17)" fill="#D79E84" cx="5.801" cy="17" rx="3.678" ry="5.335"/><ellipse transform="rotate(-75.7 30.2 17)" fill="#D79E84" cx="30.199" cy="17" rx="5.335" ry="3.678"/><path fill="#BF6952" d="M18.985 35h-1.97c-6.5 0-12.803-4.982-12.803-11.956 0-3.985 1.477-5.978 1.477-5.978s-.492-1.993-.492-3.985C5.197 7.103 11.5 2.121 18 2.121c6.5 0 12.803 5.978 12.803 10.96 0 1.993-.492 3.985-.492 3.985s1.477 1.993 1.477 5.978C31.788 30.018 25.485 35 18.985 35z"/><path fill="#BF6952" d="M22.242.17s-5.303-1.061-7.424 2.121 4.242 1.061 4.242 1.061S20.121.17 22.242.17z"/><path fill="#D79E84" d="M29.667 15.379c0-3.807-3.087-6.894-6.894-6.894-1.854 0-3.534.736-4.773 1.926-1.239-1.191-2.919-1.926-4.773-1.926-3.807 0-6.894 3.087-6.894 6.894 0 2.309 1.14 4.348 2.882 5.599-.489 1.212-.761 2.546-.761 3.946 0 5.565 4.274 9.015 9.545 9.015s9.545-3.45 9.545-9.015c0-1.401-.272-2.734-.761-3.946 1.744-1.251 2.884-3.29 2.884-5.599z"/><ellipse fill="#292F33" cx="13" cy="17" rx="2" ry="3"/><ellipse fill="#292F33" cx="23" cy="17" rx="2" ry="3"/><path fill="#642116" d="M18 31.5c2.715 0 5.027-1.38 5.895-3.309.359-.798-.25-1.691-1.157-1.691h-9.476c-.907 0-1.516.893-1.157 1.691.868 1.929 3.18 3.309 5.895 3.309z"/><ellipse fill="#642116" cx="16.5" cy="22" rx="1" ry="1.061"/><circle fill="#642116" cx="19.5" cy="22" r="1"/><path fill="#BF6952" d="M6.874 23.245c.598-1.293.876-2.323.876-3.245 0-1.308-.604-2.56-1.09-3.566-.274-.568-.557-1.156-.557-1.434 0-.193.142-.793.267-1.323.387-1.636.868-3.673.263-4.649-.15-.241-.434-.528-.942-.528C3.74 8.5.75 12.756.75 18c0 2.576.174 4.177.555 5.112L.5 36h7l-.837-12.441c.085-.093.157-.197.211-.314z"/><path fill="#9B3C07" d="M6.874 23.245c.598-1.293.876-2.323.876-3.245 0-1.308-.604-2.56-1.09-3.566-.274-.568-.557-1.156-.557-1.434 0-.193.142-.793.267-1.323.387-1.636.868-3.673.263-4.649-.064-.102-.158-.209-.277-.303-.734 1.341-1.159 2.814-1.159 4.356 0 1.992-.197 5.978-.197 9.963C5 23.359 7 36 7 36h.5l-.839-12.469c.079-.089.162-.175.213-.286z"/><path fill="#D79E84" d="M5.691 9.5c-1.373 0-4.118 3.675-4.118 8.5 0 2.542.185 4.174.55 4.851.255.475.985.47 1.688.463l.232-.001c1.16 0 1.985-.283 2.112-.558.519-1.121.771-2.023.771-2.755 0-1.036-.519-2.112-.977-3.061-.374-.776-.67-1.389-.67-1.939 0-.318.108-.791.299-1.599.264-1.116.755-3.194.396-3.771-.023-.039-.08-.13-.283-.13z"/><path fill="#BF6952" d="M35.5 36l-.805-12.888c.381-.935.555-2.535.555-5.112 0-5.244-2.99-9.5-4.941-9.5-.508 0-.792.287-.942.528-.606.976-.124 3.013.263 4.649.125.53.267 1.13.267 1.323 0 .278-.283.866-.557 1.434-.486 1.006-1.09 2.259-1.09 3.566 0 .922.278 1.952.877 3.245.054.117.126.221.211.314L28.5 36h7z"/><path fill="#9B3C07" d="M31 23.044c0-3.985-.197-7.971-.197-9.963 0-1.374-.493-2.822-1.324-4.201-.042.05-.082.1-.112.148-.606.976-.124 3.013.263 4.649.125.53.267 1.13.267 1.323 0 .278-.283.866-.557 1.434-.486 1.006-1.09 2.259-1.09 3.566 0 .922.278 1.952.877 3.245.051.11.134.197.213.286L28.5 36h.5s2-12.641 2-12.956z"/><path fill="#D79E84" d="M30.309 9.5c-.203 0-.26.091-.284.13-.358.577.133 2.655.396 3.771.191.808.299 1.281.299 1.599 0 .55-.296 1.163-.67 1.939-.458.949-.977 2.025-.977 3.061 0 .732.252 1.634.77 2.755.127.274.951.558 2.112.558l.232.001c.702.007 1.432.012 1.689-.463.365-.676.55-2.308.55-4.851 0-4.825-2.744-8.5-4.117-8.5z"/></svg> \ No newline at end of file |
