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/1f349.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/1f349.svg')
-rw-r--r-- | public/emoji/1f349.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f349.svg b/public/emoji/1f349.svg index 4ba2a40d9..0f5ec06a4 100644 --- a/public/emoji/1f349.svg +++ b/public/emoji/1f349.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(2.4717,29.4277)" id="g20"><path id="path22" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.943,-2.125 -1.472,-4.466 -1.472,-6.928 0,-9.665 8.059,-17.5 18,-17.5 7.746,0 14.33,4.767 16.869,11.441 L 0,0 Z"/></g><g transform="translate(4.3315,28.7046)" id="g24"><path id="path26" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.853,-1.902 -1.332,-3.998 -1.332,-6.205 0,-8.59 7.164,-15.555 16,-15.555 6.905,0 12.77,4.26 15.013,10.218 L 0,0 Z"/></g><g transform="translate(6.1909,27.9814)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.761,-1.678 -1.191,-3.53 -1.191,-5.481 0,-7.518 6.268,-13.612 14,-13.612 6.063,0 11.21,3.753 13.156,8.995 L 0,0 Z"/></g><g transform="translate(9.916,21.7227)" id="g32"><path id="path34" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.307,-0.46 -0.741,-0.708 -0.971,-0.555 -0.23,0.154 -0.168,0.65 0.139,1.11 0.307,0.46 0.741,0.708 0.971,0.554 C 0.369,0.956 0.307,0.46 0,0"/></g><g transform="translate(15.916,20.7227)" id="g36"><path id="path38" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.307,-0.46 -0.741,-0.708 -0.971,-0.555 -0.23,0.154 -0.168,0.65 0.139,1.11 0.307,0.46 0.741,0.708 0.971,0.554 C 0.369,0.956 0.307,0.46 0,0"/></g><g transform="translate(20.998,16.0449)" id="g40"><path id="path42" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.05,-0.551 -0.132,-1.016 -0.406,-1.041 -0.276,-0.025 -0.538,0.4 -0.588,0.951 -0.051,0.551 0.132,1.016 0.406,1.04 C -0.312,0.977 -0.05,0.552 0,0"/></g><g transform="translate(11.998,18.0449)" id="g44"><path id="path46" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.05,-0.551 -0.132,-1.016 -0.406,-1.041 -0.276,-0.025 -0.538,0.4 -0.588,0.951 -0.05,0.551 0.132,1.016 0.406,1.04 C -0.312,0.977 -0.05,0.552 0,0"/></g><g transform="translate(15.8994,12.6992)" id="g48"><path id="path50" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.333,-0.441 -0.78,-0.663 -1.001,-0.497 -0.221,0.166 -0.128,0.658 0.205,1.099 0.334,0.441 0.781,0.663 1,0.497 C 0.426,0.933 0.335,0.441 0,0"/></g><g transform="translate(23.9355,12.2451)" id="g52"><path id="path54" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.273,-0.481 0.299,-0.98 0.06,-1.115 -0.242,-0.137 -0.657,0.142 -0.929,0.624 -0.274,0.48 -0.299,0.978 -0.059,1.115 C -0.687,0.762 -0.273,0.482 0,0"/></g><g transform="translate(16.918,17.2734)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.303,-0.463 0.362,-0.958 0.131,-1.109 -0.1,-1.262 -0.532,-1.01 -0.835,-0.547 -1.138,-0.085 -1.196,0.411 -0.966,0.562 -0.735,0.715 -0.303,0.464 0,0"/></g><g transform="translate(25.8994,15.6992)" id="g60"><path id="path62" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.333,-0.441 -0.78,-0.663 -1.001,-0.497 -0.221,0.166 -0.129,0.658 0.205,1.099 0.333,0.442 0.78,0.663 1,0.497 C 0.426,0.933 0.335,0.441 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5C913B" d="M2.472 6.572C1.528 8.698 1 11.038 1 13.5 1 23.165 9.059 31 19 31c7.746 0 14.33-4.767 16.868-11.44L2.472 6.572z"/><path fill="#FFE8B6" d="M4.332 7.295C3.479 9.197 3 11.293 3 13.5c0 8.591 7.164 15.556 16 15.556 6.904 0 12.77-4.26 15.013-10.218L4.332 7.295z"/><path fill="#DD2E44" d="M6.191 8.019C5.43 9.697 5 11.548 5 13.5c0 7.518 6.268 13.611 14 13.611 6.062 0 11.21-3.753 13.156-8.995L6.191 8.019z"/><path d="M9.916 14.277c-.307.46-.741.708-.971.555-.23-.153-.168-.649.139-1.109.307-.46.741-.708.971-.555.23.153.168.649-.139 1.109zm6 1c-.307.46-.741.708-.971.555-.23-.153-.168-.649.139-1.109.307-.46.741-.708.971-.555.23.153.168.649-.139 1.109zm5.082 4.678c.05.551-.132 1.016-.406 1.041-.275.025-.538-.4-.588-.951-.051-.551.132-1.016.406-1.04.275-.026.538.398.588.95zm-9-2c.05.551-.132 1.016-.406 1.041-.275.025-.538-.4-.588-.951-.05-.551.132-1.016.406-1.04.276-.026.538.398.588.95zm3.901 5.346c-.333.441-.78.663-1 .497-.221-.166-.129-.658.205-1.099.333-.441.781-.663 1-.497.221.166.13.657-.205 1.099zm8.036.454c.273.481.299.979.06 1.115-.241.137-.656-.143-.929-.624-.273-.48-.299-.979-.059-1.115.241-.138.655.141.928.624zm-7.017-5.028c.303.463.362.958.131 1.109-.231.152-.663-.1-.966-.562-.303-.462-.361-.958-.131-1.108.231-.154.663.097.966.561zm8.981 1.574c-.333.441-.78.663-1.001.497-.221-.166-.129-.658.205-1.099.333-.442.78-.663 1-.497.222.166.131.657-.204 1.099z"/></svg> \ No newline at end of file |