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/1f476-1f3fe.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/1f476-1f3fe.svg')
| -rw-r--r-- | public/emoji/1f476-1f3fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f476-1f3fe.svg b/public/emoji/1f476-1f3fe.svg index 3905353f8..492d74083 100644 --- a/public/emoji/1f476-1f3fe.svg +++ b/public/emoji/1f476-1f3fe.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,17.5)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.639 -0.97,3.004 -2.273,3.385 -3.633,10.842 -10.15,16.5 -18,16.5 -25.85,16.5 -32.367,10.842 -33.727,3.385 -35.03,3.004 -36,1.639 -36,0 c 0,-1.736 1.087,-3.168 2.51,-3.442 1.759,-6.926 8.017,-12.058 15.49,-12.058 7.473,0 13.731,5.132 15.49,12.058 C -1.088,-3.168 0,-1.736 0,0"/></g><g transform="translate(18,11)" id="g24"><path id="path26" style="fill:#662214;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,0 -4,1 -4,-1 0,-2 2,-4 4,-4 2,0 4,2 4,4 0,2 -1,1 -4,1"/></g><g transform="translate(25,17.5)" id="g28"><path id="path30" style="fill:#662214;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.12,-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.12,2.5 0,1.381 0,0"/></g><g transform="translate(16,17.5)" id="g32"><path id="path34" style="fill:#662214;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.12,-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.12,2.5 0,1.381 0,0"/></g><g transform="translate(18,10)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,0 2,-1 C 2,-1 2,-2 1,-2 0,-2 0,-1 0,-1 L 0,0 Z"/></g><g transform="translate(17.9819,25)" id="g40"><path id="path42" style="fill:#845636;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.031,0 c -1.188,0 -2.301,0.458 -3.135,1.304 -0.746,0.756 -1.138,1.787 -1.076,2.847 0.032,0.552 0.491,0.961 1.057,0.935 0.551,-0.032 0.972,-0.507 0.939,-1.059 -0.028,-0.495 0.155,-0.983 0.504,-1.337 0.459,-0.465 1.071,-0.724 1.725,-0.729 0.653,0.036 1.27,0.247 1.735,0.706 1.298,1.28 1.313,3.377 0.033,4.676 -1.699,1.721 -4.48,1.74 -6.203,0.042 -0.394,-0.388 -1.027,-0.383 -1.414,0.01 -0.387,0.393 -0.383,1.026 0.01,1.414 2.506,2.472 6.557,2.444 9.03,-0.061 C 5.229,6.664 5.206,3.316 3.123,1.262 2.285,0.435 1.176,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M36 18.5c0-1.639-.97-3.004-2.273-3.385C32.367 7.658 25.85 2 18 2 10.15 2 3.633 7.658 2.273 15.115.97 15.496 0 16.861 0 18.5c0 1.736 1.087 3.168 2.51 3.442C4.269 28.868 10.527 34 18 34c7.473 0 13.731-5.132 15.49-12.058C34.912 21.668 36 20.236 36 18.5z"/><path fill="#662214" d="M18 25c-3 0-4-1-4 1s2 4 4 4 4-2 4-4-1-1-4-1z"/><circle fill="#662214" cx="22.5" cy="18.5" r="2.5"/><circle fill="#662214" cx="13.5" cy="18.5" r="2.5"/><path fill="#FFF" d="M18 26h2v1s0 1-1 1-1-1-1-1v-1z"/><path fill="#845636" d="M17.982 11h-.031c-1.188 0-2.301-.458-3.135-1.304-.746-.756-1.138-1.787-1.076-2.847.032-.551.49-.96 1.057-.935.551.033.972.508.939 1.06-.029.495.155.983.503 1.336.459.466 1.071.725 1.725.729.653-.036 1.27-.247 1.735-.705 1.298-1.28 1.312-3.378.032-4.677-1.699-1.721-4.48-1.74-6.202-.042-.394.389-1.027.383-1.414-.01-.388-.393-.383-1.026.01-1.414 2.506-2.472 6.557-2.444 9.03.062 2.055 2.084 2.031 5.432-.052 7.486-.836.826-1.945 1.261-3.121 1.261z"/></svg> \ No newline at end of file |
