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/1f3d7.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/1f3d7.svg')
-rw-r--r-- | public/emoji/1f3d7.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3d7.svg b/public/emoji/1f3d7.svg index 271e35a24..e77a170b5 100644 --- a/public/emoji/1f3d7.svg +++ b/public/emoji/1f3d7.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,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g><g transform="translate(31.3135,33.3218)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.274,0 -0.539,-0.042 -0.787,-0.119 -0.296,0.844 -1.096,1.45 -2.04,1.45 -1.013,0 -1.86,-0.697 -2.096,-1.637 C -5.173,-0.117 -5.482,0 -5.821,0 c -0.827,0 -1.497,-0.67 -1.497,-1.497 0,-0.201 0.041,-0.391 0.114,-0.566 -0.144,0.04 -0.292,0.067 -0.446,0.067 -0.919,0 -1.664,-0.744 -1.664,-1.663 0,-0.919 0.745,-1.663 1.664,-1.663 l 7.65,0 c 1.469,0 2.661,1.192 2.661,2.661 C 2.661,-1.191 1.469,0 0,0"/></g><g transform="translate(2,2)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,-1 12,5 11,6 0,0 Z"/></g><g transform="translate(15,2)" id="g32"><path id="path34" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-1 -12,5 -11,6 0,0 Z"/></g><g transform="translate(3,8)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,-1 10.154,5 9,6 0,0 Z"/></g><g transform="translate(14,8)" id="g40"><path id="path42" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-1 -10.154,5 -9,6 0,0 Z"/></g><g transform="translate(4,14)" id="g44"><path id="path46" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,-1 8.308,5 6.23,5 0,0 Z"/></g><g transform="translate(13,14)" id="g48"><path id="path50" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-1 -8.308,5 -6.23,5 0,0 Z"/></g><g transform="translate(5.9473,21.834)" id="g52"><path id="path54" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.517,0.092 -1.009,-0.253 -1.1,-0.77 l -3.546,-20.113 c 0.62,-0.504 1.338,-0.74 1.88,-0.85 l 3.635,20.616 c 0.091,0.516 -0.253,1.009 -0.77,1.1 L 0,0 Z"/></g><g transform="translate(15.8018,0)" id="g56"><path id="path58" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.017,0.105 0.027,0.213 0.008,0.323 l -3.65,20.7 c -0.095,0.539 -0.609,0.899 -1.147,0.804 l -0.02,-0.003 C -5.348,21.729 -5.707,21.215 -5.611,20.676 L -1.966,0 0,0 Z"/></g><g transform="translate(9,22.5)" id="g60"><path id="path62" style="fill:#be1931;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,8 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,8.5 0,8.276 0,8 L 0,0 Z"/></g><g transform="translate(3.3071,22.2725)" id="g64"><path id="path66" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.128,-0.18 -0.415,-0.197 -0.64,-0.037 -0.225,0.16 -0.304,0.435 -0.175,0.616 L 4.744,8.415 C 4.873,8.596 5.159,8.612 5.383,8.452 5.609,8.292 5.688,8.017 5.56,7.837 L 0,0 Z"/></g><g transform="translate(30.8574,21.7603)" id="g68"><path id="path70" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.256,-0.107 0.377,-0.398 0.271,-0.654 0.164,-0.909 -0.127,-1.03 -0.383,-0.924 l -22.166,9.202 c -0.255,0.106 -0.376,0.398 -0.27,0.653 0.106,0.255 0.399,0.376 0.654,0.27 L 0,0 Z"/></g><g transform="translate(12,22)" id="g72"><path id="path74" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 l -5,0 c -0.552,0 -1,0.448 -1,1 l 0,2 c 0,0.552 0.448,1 1,1 l 5,0 C -0.448,3 0,2.552 0,2 L 0,0 Z"/></g><g transform="translate(27,22.7373)" id="g76"><path id="path78" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.145 -0.117,0.263 -0.263,0.263 l -0.474,0 C -0.883,0.263 -1,0.145 -1,0 l 0,-11.475 c 0,-0.145 0.117,-0.262 0.263,-0.262 l 0.474,0 c 0.146,0 0.263,0.117 0.263,0.262 L 0,0 Z"/></g><g transform="translate(28,11.5)" id="g80"><path id="path82" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(27.5,9)" id="g84"><path id="path86" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(33,20)" id="g88"><path id="path90" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -29,0 c -0.552,0 -1,0.448 -1,1 l 0,2 c 0,0.552 0.448,1 1,1 L -1,3 C -0.447,3 0,2.552 0,2 L 0,0 Z"/></g><path id="path92" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,20 -1.16,0 0,2 1.16,0 0,-2 z"/><path id="path94" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,20 -2,0 0,2 2,0 0,-2 z"/><path id="path96" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,20 -2,0 0,2 2,0 0,-2 z"/><path id="path98" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,20 -2,0 0,2 2,0 0,-2 z"/><path id="path100" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,20 -2,0 0,2 2,0 0,-2 z"/><path id="path102" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 29,20 -2,0 0,2 2,0 0,-2 z"/><g transform="translate(31.5,22)" id="g104"><path id="path106" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 -0.5,0 -0.5,0 0,-0.5 0,-1 0,-0.5 0.5,0 0.5,0 0.5,0 c 0.276,0 0.5,0.224 0.5,0.5 l 0,1 C 0.5,-0.224 0.276,0 0,0"/></g><path id="path108" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 33,5 20,5 20,8 33,8 33,5 Z"/><g transform="translate(11,24)" id="g110"><path id="path112" style="fill:#55aced;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,-0.448 -1,-1 l 0,-2 c 0,-0.552 0.448,-1 1,-1 l 2,0 1,0 0,1 0,2 0,1 -1,0 z"/></g><path id="path114" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,20 -2,0 0,4 2,0 0,-4 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M28.25 8.513c0-.145-.117-.263-.263-.263h-.475c-.145 0-.263.118-.263.263v11.475c0 .145.117.263.263.263h.475c.145 0 .263-.117.263-.263V8.513z"/><g fill="#F19020"><circle cx="27.75" cy="19.75" r="1.5"/><circle cx="27.75" cy="22.25" r="1"/></g><path fill="#BD2032" d="M33.25 8.25h-4.129L9.946.29 9.944.289h-.001c-.016-.007-.032-.005-.047-.01C9.849.265 9.802.25 9.75.25h-.002c-.066 0-.13.014-.19.038-.045.02-.084.05-.122.082-.012.009-.026.014-.037.025-.047.046-.085.102-.11.164V.56c-.004.009-.003.02-.006.029l-5.541 7.81c-.003.004-.003.01-.006.014-.285.176-.486.477-.486.837v2c0 .552.448 1 1 1h1.495L2.031 34H.25v2h18.958v-2h-1.74l-3.713-21.75H33.25c.553 0 1-.448 1-1v-2c0-.552-.447-1-1-1zm-21.769 4L9.75 13.639 8.02 12.25h3.461zM9.75 21.3l3.667 2.404-3.667 2-3.667-2L9.75 21.3zm-3.639.71l.474-2.784 1.866 1.223-2.34 1.561zm4.938-1.561l1.87-1.225.477 2.789-2.347-1.564zm-1.299-.866l-2.828-1.885 2.828-2.322 2.828 2.322-2.828 1.885zm-2.563-3.887l.362-2.127 1.131.928-1.493 1.199zm3.633-1.198l1.132-.929.364 2.13-1.496-1.201zM5.073 8.25L9.25 2.362V6.25h-2c-.552 0-1 .448-1 1v1H5.073zm.53 16.738l2.73 1.489-3.29 1.794.56-3.283zM15.443 34H4.067l.686-4.024L9.75 27.25l5.006 2.731.687 4.019zm-1.54-9.015l.562 3.291-3.298-1.799 2.736-1.492zM13.25 8.25v-1c0-.552-.448-1-1-1h-2V1.499L26.513 8.25H13.25zm2 3h-1.16v-2h1.16v2zm3 0h-2v-2h2v2zm3 0h-2v-2h2v2zm3 0h-2v-2h2v2zm3 0h-2v-2h2v2zm3 0h-2v-2h2v2zm3-.5c0 .276-.224.5-.5.5h-1.5v-2h1.5c.276 0 .5.224.5.5v1z"/><path fill="#4B545D" d="M12.25 7.25h-2c-.552 0-1 .448-1 1v2c0 .552.448 1 1 1h3v-4h-1z"/><path fill="#CDD7DF" d="M11.25 7.25h2v4h-2z"/><path fill="#66757F" d="M34.844 24v-1H20.656v1h.844v2.469h-.844v1h14.188v-1H34V24z"/></svg> \ No newline at end of file |