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/1f69c.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/1f69c.svg')
-rw-r--r-- | public/emoji/1f69c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f69c.svg b/public/emoji/1f69c.svg index 3c2d4ff5b..014ca11d3 100644 --- a/public/emoji/1f69c.svg +++ b/public/emoji/1f69c.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,16 -3,0 0,9 3,0 0,-9 z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(24,9.8428)" id="g22"><path id="path24" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.675 -1.645,-4.843 -3.675,-4.843 l -15.616,0 c -2.029,0 -3.488,1.565 -3.257,3.494 l 0.624,5.242 c 0.231,1.929 1.992,3.807 3.928,4.199 l 14.629,3.21 C -1.504,11.744 0,9.938 0,7.265 L 0,0 Z"/></g><g transform="translate(16.5347,11.833)" id="g26"><path id="path28" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.295,-2.116 1.256,-3.833 3.465,-3.833 l 9,0 c 2.209,0 4,1.717 4,3.833 l 0,15.333 c 0,2.118 -1.453,3.834 -3.245,3.834 l -7.303,0 c -1.791,0 -3.484,-1.716 -3.779,-3.834 L 0,0 Z"/></g><g transform="translate(18.2451,11)" id="g30"><path id="path32" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.135,-1.104 0.65,-2 1.755,-2 l 9,0 c 1.104,0 2,0.896 2,2 l 0,14 c 0,1.104 -0.743,2 -1.66,2 L 3.622,16 C 2.705,16 1.852,15.104 1.716,14 L 0,0 Z"/></g><path id="path34" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 33,15 15,15 15,5 33,5 33,15 Z"/><g transform="translate(33,13)" id="g36"><path id="path38" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -31,0 -30,2 0,2 0,0 Z"/></g><g transform="translate(12,5)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(10,5)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(33,20)" id="g48"><path id="path50" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 -10,-9 -7,1 3,10 3,2 11,0 z"/></g><g transform="translate(18.2222,9.8887)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.91 3.979,8.889 8.889,8.889 4.91,0 8.889,-3.979 8.889,-8.889 0,-4.91 -3.979,-8.889 -8.889,-8.889 C 3.979,-8.889 0,-4.91 0,0"/></g><g transform="translate(32.667,9.8887)" id="g56"><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.068 -2.487,-5.556 -5.556,-5.556 -3.068,0 -5.555,2.488 -5.555,5.556 0,3.068 2.487,5.556 5.555,5.556 C -2.487,5.556 0,3.068 0,0"/></g><g transform="translate(30.4443,9.8887)" id="g60"><path id="path62" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.841 -1.492,-3.333 -3.333,-3.333 -1.842,0 -3.334,1.492 -3.334,3.333 0,1.842 1.492,3.334 3.334,3.334 C -1.492,3.334 0,1.842 0,0"/></g><g transform="translate(32.5879,29)" id="g64"><path id="path66" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,1.187 -1.607,2 -2.833,2 l -7.303,0 C -11.362,2 -12.53,1.187 -13.248,0 L 0,0 Z"/></g><g transform="translate(29.333,9.8887)" id="g68"><path id="path70" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.227 -0.995,-2.222 -2.222,-2.222 -1.227,0 -2.222,0.995 -2.222,2.222 0,1.227 0.995,2.223 2.222,2.223 C -0.995,2.223 0,1.227 0,0"/></g><g transform="translate(9,5)" id="g72"><path id="path74" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><path id="path76" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,21 -3,0 0,2 3,0 0,-2 z"/><g transform="translate(16.0005,7.25)" id="g78"><path id="path80" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.094,0 -0.19,0.013 -0.285,0.041 -0.814,0.198 -1.116,0.755 -0.96,1.284 l 2,6.75 c 0.38,1.92 2.147,5.716 5.959,5.716 l 10,0 c 0.553,0 1,-0.448 1,-1 0,-0.552 -0.447,-1 -1,-1 l -10,0 C 3.856,11.75 2.988,7.596 2.98,7.554 L 0.958,0.716 C 0.83,0.281 0.431,0 0,0"/></g><g transform="translate(2.0015,7)" id="g82"><path id="path84" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.042,0 -0.083,0.003 -0.125,0.008 -0.548,0.068 -0.937,0.568 -0.869,1.116 l 1,8 C 0.075,9.673 0.575,10.06 1.123,9.992 1.67,9.924 2.059,9.424 1.991,8.876 l -1,-8 C 0.928,0.37 0.497,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M11 11h3v9h-3z"/><path fill="#77B255" d="M24 26.157C24 28.832 22.354 31 20.325 31H4.709c-2.029 0-3.488-1.565-3.258-3.494l.625-5.241c.23-1.93 1.992-3.808 3.928-4.199l14.628-3.21C22.496 14.413 24 16.219 24 18.893v7.264z"/><path fill="#292F33" d="M16.535 24.167C16.239 26.283 17.791 28 20 28h9c2.209 0 4-1.717 4-3.833V8.833C33 6.716 31.547 5 29.755 5h-7.303c-1.792 0-3.484 1.716-3.78 3.833l-2.137 15.334z"/><path fill="#BBDDF5" d="M18.245 25c-.135 1.104.65 2 1.755 2h9c1.104 0 2-.896 2-2V11c0-1.104-.743-2-1.66-2h-7.473c-.917 0-1.771.896-1.906 2l-1.716 14z"/><path fill="#77B255" d="M15 21h18v10H15z"/><path fill="#FFCC4D" d="M33 23H2l1-2h30z"/><circle fill="#292F33" cx="8" cy="31" r="4"/><circle fill="#FFCC4D" cx="8" cy="31" r="2"/><path fill="#77B255" d="M33 16v4l-10 9-7-1 3-10 3-2z"/><path fill="#292F33" d="M18.222 26.111c0-4.91 3.979-8.889 8.889-8.889 4.91 0 8.889 3.979 8.889 8.889C36 31.021 32.021 35 27.111 35c-4.91 0-8.889-3.979-8.889-8.889z"/><path fill="#FFCC4D" d="M32.667 26.111c0 3.068-2.487 5.556-5.556 5.556-3.068 0-5.556-2.487-5.556-5.556 0-3.068 2.487-5.556 5.556-5.556 3.069.001 5.556 2.488 5.556 5.556z"/><path fill="#FFE8B6" d="M30.444 26.111c0 1.841-1.492 3.333-3.333 3.333-1.842 0-3.334-1.492-3.334-3.333 0-1.842 1.492-3.334 3.334-3.334 1.841 0 3.333 1.493 3.333 3.334z"/><path fill="#77B255" d="M32.588 7c-.552-1.187-1.606-2-2.833-2h-7.303c-1.227 0-2.395.813-3.112 2h13.248z"/><path fill="#F4900C" d="M29.333 26.111c0 1.227-.995 2.222-2.222 2.222-1.227 0-2.223-.995-2.223-2.222 0-1.227.995-2.223 2.223-2.223 1.227.001 2.222.996 2.222 2.223z"/><circle fill="#F4900C" cx="8" cy="31" r="1"/><path fill="#66757F" d="M11 13h3v2h-3z"/><path fill="#5C913B" d="M16 28.75c-.094 0-.19-.013-.285-.041-.529-.157-.832-.714-.675-1.243l2-6.75C17.421 18.796 19.188 15 23 15h10c.553 0 1 .448 1 1s-.447 1-1 1H23c-3.144 0-4.011 4.154-4.02 4.196l-2.021 6.838c-.129.435-.527.716-.959.716z"/><path fill="#3E721D" d="M2.001 29c-.042 0-.083-.003-.125-.008-.548-.068-.937-.568-.868-1.116l1-8c.068-.549.569-.936 1.116-.868.548.068.937.568.868 1.116l-1 8c-.063.506-.494.876-.991.876z"/></svg> \ No newline at end of file |