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/1f1f1-1f1ee.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/1f1f1-1f1ee.svg')
| -rw-r--r-- | public/emoji/1f1f1-1f1ee.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f1-1f1ee.svg b/public/emoji/1f1f1-1f1ee.svg index 5b878c9d7..9e474bc1f 100644 --- a/public/emoji/1f1f1-1f1ee.svg +++ b/public/emoji/1f1f1-1f1ee.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,9)" id="g20"><path id="path22" style="fill:#ce1b26;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 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#002b7f;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,-9 36,0 0,9 C 4,-1.791 2.209,0 0,0"/></g><path id="path28" style="fill:#b28914;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,22 -4,0 0,3 4,0 0,-3 z"/><g transform="translate(7.8975,25.4512)" id="g30"><path id="path32" style="fill:#b28914;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.095,-3.184 -3.23,0 c -0.398,0.772 -0.726,1.429 -0.726,2.318 0,0.744 0.585,1.334 1.428,1.334 C -1.73,0.468 -0.75,0.167 0,0"/></g><g transform="translate(7.8262,25.5918)" id="g34"><path id="path36" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.023,-0.328 c -0.626,0.095 -1.514,0.445 -2.342,0.445 -0.764,0 -1.357,-0.306 -1.357,-1.077 0,-0.76 0.322,-1.451 0.749,-2.153 l -0.444,-0.211 c -0.398,0.772 -0.726,1.429 -0.726,2.317 0,0.744 0.584,1.475 1.592,1.475 C -1.659,0.468 -0.75,0.168 0,0"/></g><g transform="translate(8.4653,25.4512)" id="g38"><path id="path40" style="fill:#b28914;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.095,-3.184 3.23,0 c 0.398,0.772 0.726,1.429 0.726,2.318 0,0.744 -0.585,1.334 -1.428,1.334 C 1.73,0.468 0.75,0.167 0,0"/></g><g transform="translate(8.5366,25.5918)" id="g42"><path id="path44" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.023,-0.328 c 0.626,0.095 1.514,0.445 2.342,0.445 0.764,0 1.357,-0.306 1.357,-1.077 0,-0.76 -0.322,-1.451 -0.749,-2.153 l 0.444,-0.211 c 0.398,0.772 0.726,1.429 0.726,2.317 0,0.744 -0.585,1.475 -1.592,1.475 C 1.659,0.468 0.75,0.168 0,0"/></g><g transform="translate(8.1812,27.7324)" id="g46"><path id="path48" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.262,-0.49 0,-0.982 0.263,-0.49 0,0 Z M 0,1.242 -0.262,0.75 0,0.26 0.263,0.75 0,1.242 Z"/></g><g transform="translate(8.2905,27.8618)" id="g50"><path id="path52" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.413,-0.262 0.827,0 0.413,0.263 0,0 Z M -1.045,0 -0.631,-0.262 -0.218,0 -0.631,0.263 -1.045,0 Z"/></g><g transform="translate(8.1812,28.0547)" id="g54"><path id="path56" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.11,0 0.199,-0.088 0.199,-0.198 0.199,-0.309 0.11,-0.397 0,-0.397 c -0.109,0 -0.199,0.088 -0.199,0.199 C -0.199,-0.088 -0.109,0 0,0"/></g><g transform="translate(8.1812,27.1187)" id="g58"><path id="path60" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.294,0 0.533,-0.238 0.533,-0.533 0,-0.293 -0.239,-0.531 -0.533,-0.531 -0.294,0 -0.532,0.238 -0.532,0.531 C -0.532,-0.238 -0.294,0 0,0"/></g><g transform="translate(8.1807,23.8003)" id="g62"><path id="path64" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.658,0 -1.141,-0.311 -1.17,-1.1 -0.161,0.283 -0.841,1.173 -1.476,1.054 -0.376,-0.071 -0.71,-0.594 -0.653,-1.194 -0.314,0.898 -1.228,1.046 -1.897,0.515 0.593,-0.488 0.858,-1.927 1.356,-2.552 l 3.84,0 3.84,0 c 0.499,0.625 0.764,2.064 1.357,2.552 C 4.529,-0.194 3.614,-0.342 3.302,-1.24 3.357,-0.64 3.023,-0.117 2.645,-0.046 2.011,0.073 1.332,-0.817 1.171,-1.1 1.142,-0.311 0.658,0 0,0"/></g><g transform="translate(12.0088,20.5229)" id="g66"><path id="path68" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.284 -1.715,-0.597 -3.828,-0.597 -2.112,0 -3.827,0.313 -3.827,0.597 0,0.284 1.715,0.433 3.827,0.433 C -1.715,0.433 0,0.284 0,0"/></g><g transform="translate(12.0088,20.5229)" id="g70"><path id="path72" style="fill:none;stroke:#000000;stroke-width:0.076;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 0,-0.284 -1.715,-0.597 -3.828,-0.597 -2.112,0 -3.827,0.313 -3.827,0.597 0,0.284 1.715,0.433 3.827,0.433 C -1.715,0.433 0,0.284 0,0 Z"/></g><g transform="translate(7.7153,25.6172)" id="g74"><path id="path76" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.585,-0.085 0.931,0 0,0 0.135,-1.197 0.253,-1.641 0,0 -0.412,0.117 -0.703,0.117 -0.29,0 -0.732,-0.117 -0.732,-0.117 0,0 0.083,0.539 0.145,0.899 C -0.043,-0.383 0,0 0,0"/></g><g transform="translate(3.312,23.9819)" id="g78"><path id="path80" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.189,0.804 -0.198,1.626 0.817,2.324 1.832,3.023 3.524,2.434 3.993,2.317 4.462,2.2 4.471,1.69 3.897,1.833 3.323,1.976 1.714,2.424 0.938,1.731 0.162,1.038 0.312,0.527 0.431,0.117 0.775,-1.063 0.147,-0.627 0,0"/></g><g transform="translate(13.0508,23.9355)" id="g82"><path id="path84" style="fill:#ffd83d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.189,0.804 0.198,1.626 -0.817,2.324 -1.832,3.023 -3.524,2.434 -3.993,2.317 -4.462,2.2 -4.471,1.69 -3.897,1.833 -3.323,1.976 -1.714,2.424 -0.938,1.731 -0.162,1.038 -0.317,0.529 -0.431,0.117 -0.692,-0.828 -0.147,-0.627 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CE1B26" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#002B7F" d="M32 5H4C1.791 5 0 6.791 0 9v9h36V9c0-2.209-1.791-4-4-4z"/><path fill="#B28914" d="M12.516 11.415c0-.744-.585-1.334-1.428-1.334-.892 0-1.873.3-2.623.468h-.568c-.75-.167-1.73-.468-2.623-.468-.843 0-1.428.59-1.428 1.334 0 .889.328 1.545.726 2.317h7.217c.399-.772.727-1.428.727-2.317z"/><path fill="#FFD83D" d="M7.826 10.408l-.023.328c-.626-.095-1.513-.445-2.341-.445-.764 0-1.357.306-1.357 1.077 0 .76.322 1.451.75 2.153l-.445.211c-.397-.772-.725-1.429-.725-2.317 0-.744.584-1.475 1.591-1.475.891 0 1.801.301 2.55.468zm.711 0l.023.328c.626-.095 1.513-.445 2.341-.445.765 0 1.357.306 1.357 1.077 0 .76-.322 1.451-.75 2.153l.445.211c.397-.772.725-1.429.725-2.317 0-.744-.584-1.475-1.591-1.475-.891 0-1.801.301-2.55.468zm-.356-3.382l-.262.492.262.49.263-.49zm0 1.242l-.262.49.262.492.263-.492zm-.935-.13l.414.262.412-.262-.412-.263zm1.045 0l.412.262.414-.262-.414-.263z"/><path fill="#FFD83D" d="M8.181 7.945c.11 0 .199.088.199.198 0 .11-.089.199-.199.199-.109 0-.199-.088-.199-.199 0-.109.09-.198.199-.198zm0 .936c.294 0 .533.238.533.533 0 .293-.238.531-.533.531-.294 0-.532-.238-.532-.531 0-.294.238-.533.532-.533zm0 3.319c-.658 0-1.141.311-1.17 1.1-.161-.283-.841-1.173-1.476-1.054-.376.071-.71.594-.653 1.194-.313-.898-1.228-1.046-1.896-.515.593.488.857 1.927 1.356 2.552h7.68c.499-.625.764-2.064 1.357-2.552-.668-.531-1.583-.383-1.895.515.055-.6-.279-1.124-.657-1.194-.634-.119-1.313.771-1.474 1.054-.03-.79-.514-1.1-1.172-1.1z"/><path d="M11.718 15.253c-.591-.164-1.95-.246-3.537-.247-1.057 0-2.015.037-2.71.11-.348.036-.629.082-.827.137-.194.058-.319.111-.329.224.009.112.132.175.326.249.591.211 1.951.386 3.539.386 1.058 0 2.017-.078 2.712-.192.348-.057.63-.123.827-.194.195-.073.317-.137.326-.249-.008-.114-.133-.167-.327-.224z"/><path fill="#FFD83D" d="M7.715 10.383s.585.084.931 0c0 0 .135 1.197.252 1.641 0 0-.412-.117-.702-.117s-.733.117-.733.117.083-.539.146-.898.106-.743.106-.743zm-4.403 1.635c-.189-.804-.198-1.625.817-2.324s2.708-.109 3.176.007.478.627-.096.484-2.183-.591-2.959.102-.626 1.204-.507 1.614c.344 1.181-.284.744-.431.117zm9.739.046c.189-.804.198-1.625-.817-2.324s-2.708-.109-3.176.008-.478.627.096.484 2.183-.591 2.959.102.621 1.202.507 1.614c-.261.945.283.743.431.116z"/></svg> \ No newline at end of file |
