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/1f1e8-1f1e6.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/1f1e8-1f1e6.svg')
-rw-r--r-- | public/emoji/1f1e8-1f1e6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e8-1f1e6.svg b/public/emoji/1f1e8-1f1e6.svg index 555d21808..d9c386dbe 100644 --- a/public/emoji/1f1e8-1f1e6.svg +++ b/public/emoji/1f1e8-1f1e6.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(4,31)" id="g20"><path id="path22" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-18 c 0,-2.209 1.791,-4 4,-4 l 6,0 0,26 -6,0 z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 0,-26 6,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><path id="path28" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,5 26,5 26,31 10,31 10,5 Z"/><g transform="translate(18.6152,13.8867)" id="g30"><path id="path32" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.198,-0.139 2.272,-0.264 3.469,-0.401 L 3.164,0.601 C 3.115,0.776 3.186,0.969 3.323,1.076 L 6.802,3.91 6.082,4.249 C 5.765,4.362 5.853,4.541 5.967,4.971 L 6.498,6.907 4.477,6.48 C 4.279,6.451 4.148,6.576 4.118,6.696 L 3.858,7.607 2.26,5.813 C 2.033,5.526 1.573,5.526 1.716,6.189 L 2.399,9.824 1.483,9.349 C 1.226,9.205 0.969,9.181 0.825,9.438 l -1.264,2.366 -0.001,-0.059 0,0.059 -1.265,-2.366 C -1.849,9.181 -2.105,9.205 -2.362,9.349 L -3.278,9.824 -2.596,6.189 C -2.452,5.526 -2.913,5.526 -3.14,5.813 L -4.738,7.607 -4.998,6.696 C -5.028,6.576 -5.16,6.451 -5.357,6.48 l -2.02,0.427 0.531,-1.936 C -6.733,4.541 -6.645,4.362 -6.962,4.249 L -7.682,3.91 -4.203,1.076 c 0.138,-0.107 0.207,-0.3 0.158,-0.475 L -4.35,-0.401 c 1.199,0.137 2.273,0.262 3.471,0.401 0.106,0 0.175,-0.059 0.175,-0.181 l -0.214,-3.704 0.957,0 -0.214,3.704 C -0.175,-0.059 -0.106,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D52B1E" d="M4 5C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h6V5H4zm28 0h-6v26h6c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M10 5h16v26H10z"/><path fill="#D52B1E" d="M18.615 22.113c1.198.139 2.272.264 3.469.401l-.305-1.002c-.049-.176.021-.368.159-.476l3.479-2.834-.72-.339c-.317-.113-.23-.292-.115-.722l.531-1.936-2.021.427c-.197.03-.328-.095-.358-.215l-.261-.911-1.598 1.794c-.227.288-.687.288-.544-.376l.683-3.634-.917.475c-.257.144-.514.168-.657-.089l-1.265-2.366v.059-.059l-1.265 2.366c-.144.257-.401.233-.658.089l-.916-.475.683 3.634c.144.664-.317.664-.544.376l-1.598-1.793-.26.911c-.03.12-.162.245-.359.215l-2.021-.427.531 1.936c.113.43.201.609-.116.722l-.72.339 3.479 2.834c.138.107.208.3.158.476l-.305 1.002 3.47-.401c.106 0 .176.059.175.181l-.214 3.704h.956l-.213-3.704c.002-.123.071-.182.177-.182z"/></svg> \ No newline at end of file |