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/1f645-1f3fc.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/1f645-1f3fc.svg')
-rw-r--r-- | public/emoji/1f645-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f645-1f3fc.svg b/public/emoji/1f645-1f3fc.svg index af386803e..1db0387cd 100644 --- a/public/emoji/1f645-1f3fc.svg +++ b/public/emoji/1f645-1f3fc.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><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 4,15 13,8 9,0 27,0 c 0,0 4,9 0,9 L 27,9 4,21 4,15 Z"/></clipPath><clipPath id="clipPath68" clipPathUnits="userSpaceOnUse"><path id="path70" 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(19,36)" id="g20"><path id="path22" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.721,0 -3.343,-0.406 -4.794,-1.111 -5.186,-1.042 -5.588,-1 -6,-1 c -3.866,0 -7,-3.134 -7,-7 l 0,-12 0.018,0 c 0.183,-6.467 5.471,-11.656 11.982,-11.656 6.511,0 11.799,5.189 11.982,11.656 l 0.018,0 0,9 C 11,-4.925 6.075,0 0,0"/></g><g transform="translate(27,9)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(14,31)" id="g28"><path id="path30" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,-5.308 -5,-5.936 L -5,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><g transform="translate(19,14)" id="g32"><path id="path34" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(27,0)" id="g36"><path id="path38" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -15.001,9 -17,8 -3,0 0,0 Z"/></g><g transform="translate(2.6553,21.9839)" id="g40"><path id="path42" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.075,0.363 0,0.653 C -0.149,1.016 -0.219,0.987 -0.292,0.971 -0.567,1.415 -1.09,1.669 -1.632,1.557 -2.325,1.414 -2.771,0.735 -2.629,0.04 l 0.554,-2.674 0,-2.35 c 0,-1.104 0.895,-2 2,-2 l 1,0 1,0 0,5 c 0,0 -0.856,1.895 -1.925,1.984"/></g><g transform="translate(1.5801,28)" id="g44"><path id="path46" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,-0.447 -1,-1 l 1,-6 0,-5 c 0,-0.553 0.448,-1 1,-1 l 2,0 0,2 L 2.42,-7 1,-1 C 1,-1 0.553,0 0,0"/></g><g transform="translate(27,9)" id="g48"><path id="path50" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4,0 0,-9 0,-9 L -23,6 -23,12 0,0 Z"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(22,12)" id="g60"><path id="path62" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,3 -12,-1 -9.001,-3 0,0 Z m 6,-2 -16,-10 -3,0 17,11 2,-1 z"/></g></g></g><g id="g64"><g clip-path="url(#clipPath68)" id="g66"><g transform="translate(34.9766,23.541)" id="g72"><path id="path74" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.541,0.112 -1.064,-0.142 -1.341,-0.586 -0.071,0.016 -0.142,0.045 -0.216,0.045 l 0,-0.653 -0.075,-0.363 c -1.069,-0.089 -1.925,-1.984 -1.925,-1.984 l 0,-5 1,0 1,0 c 1.105,0 2,0.896 2,2 l 0,2.35 0.554,2.674 C 1.139,-0.822 0.693,-0.143 0,0"/></g><g transform="translate(34.4199,28)" id="g76"><path id="path78" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.552,0 1,-0.447 1,-1 l -1,-6 0,-5 c 0,-0.553 -0.448,-1 -1,-1 l -2,0 0,2 0.58,4 1.42,6 c 0,0 0.447,1 1,1"/></g><g transform="translate(9,9)" id="g80"><path id="path82" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-9 23,6 23,12 0,0 Z"/></g><g transform="translate(19,16.5)" id="g84"><path id="path86" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(14,20)" id="g88"><path id="path90" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(22,20)" id="g92"><path id="path94" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFE51E" d="M19 0c-1.721 0-3.343.406-4.793 1.111C13.814 1.043 13.412 1 13 1 9.134 1 6 4.134 6 8v12h.018C6.201 26.467 11.489 31.656 18 31.656S29.799 26.467 29.982 20H30v-9c0-6.075-4.925-11-11-11z"/><path fill="#F3D2A2" d="M14 5s-.003 5.308-5 5.936V17c0 4.971 4.029 9 9 9s9-4.029 9-9v-5.019C15.89 11.605 14 5 14 5z"/><circle fill="#DF1F32" cx="18" cy="22" r="1"/><path fill="#9268CA" d="M27 27H9c-2.209 0-4 1.791-4 4v5h26v-5c0-2.209-1.791-4-4-4z"/><path fill="#E2C196" d="M2.58 13c-.074 0-1.015-.653-1.557-.541-.693.144-1.139.822-.997 1.517L.58 16.65V19c0 1.104.896 2 2 2h2l-2-8z"/><path fill="#F3D2A2" d="M1.58 8c-.552 0-1 .447-1 1l1 6v5c0 .553.448 1 1 1h2v-2L4 15 2.58 9s-.447-1-1-1z"/><path fill="#9268CA" d="M27 27c4 0 0 9 0 9L4 21v-6l23 12z"/><path fill="#7450A8" d="M19.347 31.408l7.326-4.579-1.938-1.011L9 36h3l5.731-3.582L24 36h3zm2.195-7.255l-4.819-2.515-6.647 3.324 3.056 1.994z"/><path fill="#E2C196" d="M34.977 12.459c-.541-.112-1.064.142-1.341.586C33.564 13.029 31.42 21 31.42 21h2c1.104 0 2-.896 2-2v-2.35l.554-2.675c.141-.694-.304-1.373-.997-1.516z"/><path fill="#F3D2A2" d="M34.42 8c.552 0 1 .447 1 1l-1 6v5c0 .553-.448 1-1 1h-2v-2l.58-4 1.42-6s.447-1 1-1z"/><path fill="#9268CA" d="M32 15L9 27c-2.209 0-4 1.791-4 4v5h4l9.035-5.846L18 30.13 32 21v-6z"/><path fill="#C1694F" d="M19 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M14 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/></svg> \ No newline at end of file |