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/1f1f5-1f1fe.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/1f1f5-1f1fe.svg')
| -rw-r--r-- | public/emoji/1f1f5-1f1fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f5-1f1fe.svg b/public/emoji/1f1f5-1f1fe.svg index 1853d28da..c8e83dc3f 100644 --- a/public/emoji/1f1f5-1f1fe.svg +++ b/public/emoji/1f1f5-1f1fe.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(0,9)" id="g20"><path id="path22" style="fill:#0038a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 L 36,4 0,4 0,0 Z"/></g><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,13 36,13 36,23 0,23 0,13 Z"/><g transform="translate(32,31)" id="g26"><path id="path28" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 36,0 0,4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(21.9998,18)" id="g30"><path id="path32" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(21.7504,18)" id="g34"><path id="path36" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.071 -1.68,-3.75 -3.75,-3.75 -2.071,0 -3.75,1.679 -3.75,3.75 0,2.071 1.679,3.75 3.75,3.75 C -1.68,3.75 0,2.071 0,0"/></g><g transform="translate(21.2499,17.9998)" id="g38"><path id="path40" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.795 -1.455,-3.25 -3.25,-3.25 -1.795,0 -3.25,1.455 -3.25,3.25 0,1.795 1.455,3.25 3.25,3.25 C -1.455,3.25 0,1.795 0,0"/></g><g transform="translate(21.1256,17.9999)" id="g42"><path id="path44" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.726 -1.4,-3.126 -3.125,-3.126 -1.726,0 -3.125,1.4 -3.125,3.126 0,1.725 1.399,3.124 3.125,3.124 C -1.4,3.124 0,1.725 0,0"/></g><g transform="translate(21.1323,18.0204)" id="g46"><path id="path48" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.73 -1.402,3.132 -3.132,3.132 -4.863,3.132 -6.265,1.73 -6.265,0 c 0,-0.574 0.154,-1.111 0.423,-1.573 l 2.712,1.491 2.707,-1.491 C -0.154,-1.111 0,-0.574 0,0"/></g><g transform="translate(20.4998,18.0001)" id="g50"><path id="path52" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.88,-2.5 -5,-1.381 -5,0 -5,1.381 -3.88,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(20.4,18)" id="g54"><path id="path56" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.326 -1.074,2.4 -2.4,2.4 -1.326,0 -2.4,-1.074 -2.4,-2.4 0,-1.326 1.074,-2.4 2.4,-2.4 1.326,0 2.4,1.074 2.4,2.4"/></g><g transform="translate(18,18.8179)" id="g58"><path id="path60" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.184,-0.565 0.594,0 L 0.297,-0.915 0.48,-1.48 0,-1.131 -0.48,-1.48 l 0.183,0.565 -0.481,0.35 0.594,0 L 0,0 Z"/></g><g transform="translate(18.4971,19.4834)" id="g62"><path id="path64" style="fill:#007127;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.3,0.07 0.476,0.088 0.176,0.018 0.335,-0.387 0.545,-0.458 0.214,-0.071 0.212,-0.282 0.3,-0.528 0.088,-0.247 0.035,-0.3 0.035,-0.581 0,-0.282 0.159,-0.423 0.124,-0.635 C 1.444,-2.325 1.268,-2.378 1.163,-2.519 1.058,-2.66 1.145,-2.836 1.039,-2.941 0.934,-3.047 0.581,-3.029 0.458,-3.136 0.335,-3.241 0.106,-3.399 -0.053,-3.311 c -0.158,0.087 -0.493,0.123 -0.493,0.123 0,0 0.088,0.317 0.335,0.422 0.247,0.106 0.352,0.088 0.581,0.159 0.23,0.071 0.211,0.176 0.37,0.317 0.158,0.141 0.176,0.335 0.264,0.476 0.089,0.141 0.106,0.246 0.071,0.44 C 1.039,-1.18 0.969,-0.969 0.898,-0.792 0.828,-0.617 0.67,-0.405 0.563,-0.282 0.458,-0.159 0,0 0,0"/></g><g transform="translate(17.4053,19.3779)" id="g66"><path id="path68" style="fill:#007127;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.175,0.383 0,0.405 -0.705,0.088 -0.846,-0.546 -1.057,-0.616 -0.214,-0.072 -0.247,-0.423 -0.335,-0.67 -0.088,-0.246 -0.052,-0.299 -0.052,-0.581 0,-0.282 0.005,-0.335 0.04,-0.546 0.035,-0.212 0.083,-0.37 0.189,-0.512 0.105,-0.14 0.146,-0.21 0.252,-0.316 0.105,-0.105 0.311,-0.212 0.435,-0.317 0.123,-0.106 0.498,-0.141 0.657,-0.053 0.158,0.088 0.434,0.123 0.434,0.123 0,0 -0.117,0.212 -0.364,0.317 -0.246,0.106 -0.264,0.194 -0.493,0.264 -0.229,0.071 -0.211,0.177 -0.37,0.318 -0.158,0.141 -0.176,0.334 -0.264,0.475 -0.088,0.141 -0.041,0.176 -0.006,0.37 0.036,0.194 0.106,0.352 0.177,0.528 0.07,0.177 0.246,0.406 0.352,0.529 C -0.299,-0.159 0,0 0,0"/></g><g transform="translate(17.4229,16.1367)" id="g70"><path id="path72" style="fill:#007127;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.229,-0.158 0.528,0.053 0.81,-0.141 1.18,0 0.81,-0.265 0.546,-0.053 0.264,-0.247 -0.018,-0.088 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#0038A8" d="M0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-4H0v4z"/><path fill="#EEE" d="M0 13h36v10H0z"/><path fill="#D52B1E" d="M32 5H4C1.791 5 0 6.791 0 9v4h36V9c0-2.209-1.791-4-4-4z"/><path d="M22 18c0 2.209-1.791 4-4 4s-4-1.791-4-4 1.791-4 4-4 4 1.791 4 4z"/><path fill="#EEE" d="M21.75 18c0 2.071-1.68 3.75-3.75 3.75s-3.75-1.68-3.75-3.75 1.679-3.75 3.75-3.75 3.75 1.679 3.75 3.75z"/><path d="M21.25 18c0 1.795-1.455 3.25-3.25 3.25s-3.25-1.455-3.25-3.25 1.455-3.25 3.25-3.25 3.25 1.455 3.25 3.25z"/><path fill="#EEE" d="M21.126 18c0 1.726-1.4 3.126-3.126 3.126s-3.124-1.4-3.124-3.126 1.399-3.124 3.124-3.124c1.726 0 3.126 1.399 3.126 3.124z"/><path fill="#99AAB5" d="M21.132 17.98c0-1.73-1.402-3.132-3.132-3.132s-3.132 1.402-3.132 3.132c0 .573.154 1.111.423 1.573l2.712-1.491 2.707 1.491c.268-.463.422-1 .422-1.573z"/><path d="M20.5 18c0 1.381-1.119 2.5-2.5 2.5s-2.5-1.119-2.5-2.5 1.12-2.5 2.5-2.5 2.5 1.119 2.5 2.5z"/><circle fill="#EEE" cx="18" cy="18" r="2.4"/><path fill="#FFAC33" d="M18 17.182l.184.565h.594l-.481.35.183.565-.48-.349-.48.349.183-.565-.481-.35h.594z"/><path fill="#007127" d="M18.497 16.517s.3-.07.476-.088c.176-.018.334.388.545.458.214.072.212.282.3.529.088.247.035.299.035.581s.158.423.123.634c-.035.211-.211.264-.316.405-.105.142-.018.317-.124.423-.105.105-.458.088-.581.194-.123.105-.352.264-.511.176-.158-.088-.493-.123-.493-.123s.088-.317.335-.423c.247-.105.352-.088.581-.158.229-.071.211-.177.37-.317.158-.141.176-.335.264-.476.089-.141.106-.247.071-.441-.036-.194-.107-.405-.177-.582-.07-.176-.229-.387-.335-.511-.105-.123-.563-.281-.563-.281z"/><path fill="#007127" d="M17.405 16.622s.175-.383 0-.405c-.705-.088-.846.546-1.057.616-.213.072-.247.423-.334.669-.088.247-.053.299-.053.582 0 .282.005.334.041.546.035.211.083.37.188.511.106.141.146.211.252.316.105.105.312.212.435.317.123.105.498.141.657.053.158-.088.435-.123.435-.123s-.118-.212-.364-.317c-.247-.105-.264-.193-.493-.264-.229-.071-.211-.177-.37-.317-.158-.141-.176-.335-.264-.476-.088-.141-.041-.176-.005-.37.035-.194.105-.352.176-.528.07-.176.247-.405.352-.528.105-.123.404-.282.404-.282z"/><path fill="#007127" d="M17.423 19.863l.229.158.299-.211.282.194.37-.141-.37.265-.264-.212-.282.194-.282-.159z"/></svg> \ No newline at end of file |
