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/1f471-200d-2640-fe0f.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/1f471-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f471-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f471-200d-2640-fe0f.svg b/public/emoji/1f471-200d-2640-fe0f.svg index a3f7c1998..2fec72cd9 100644 --- a/public/emoji/1f471-200d-2640-fe0f.svg +++ b/public/emoji/1f471-200d-2640-fe0f.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(18,33.0005)" id="g20"><path id="path22" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 6,0 16,-3 16,-16 0,-13 0,-16 -3,-16 -3,0 -7,3 -13,3 -6,0 -9.915,-3 -13,-3 -3.343,0 -3,12 -3,16 0,13 10,16 16,16"/></g><g transform="translate(6,17.4375)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,8.526 5.373,15.438 12,15.438 18.627,15.438 24,8.526 24,0 24,-8.525 18.627,-15.438 12,-15.438 5.373,-15.438 0,-8.525 0,0"/></g><g transform="translate(13.3096,23.9048)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.604,-2.603 c -0.489,-0.49 -0.986,-0.891 -1.424,-1.245 -1.201,-0.969 -2.069,-1.669 -2.224,-3.526 0.201,-5.279 2.634,-9.947 6.364,-12.179 1.716,0.322 7.44,0.324 9.16,0.003 3.691,2.212 6.121,6.831 6.354,12.108 -0.316,3.208 -3.913,4.699 -7.12,4.699 C 5.139,-2.743 1.157,-0.651 0,0 m -0.037,-20.57 -0.169,0.098 c -4.102,2.356 -6.783,7.384 -6.998,13.121 0.191,2.32 1.35,3.255 2.577,4.246 0.44,0.355 0.895,0.722 1.349,1.177 l 3.125,3.124 0.32,-0.191 c 0.046,-0.028 4.702,-2.794 8.339,-2.794 3.624,0 7.696,-1.761 8.071,-5.628 -0.249,-5.742 -2.927,-10.717 -6.985,-13.052 l -0.169,-0.098 -0.189,0.049 c -1.319,0.34 -7.771,0.338 -9.082,-0.003 l -0.189,-0.049 z"/></g><g transform="translate(7.1176,15.9998)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,7.732 4.872,14 10.882,14 6.01,0 10.883,-6.268 10.883,-14 0,-7.731 -4.873,-14 -10.883,-14 C 4.872,-14 0,-7.731 0,0"/></g><g transform="translate(28.9375,16.3955)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.318,3.275 -3.915,4.767 -7.122,4.767 -3.367,0 -7.349,2.091 -8.506,2.742 l -2.603,-2.603 c -0.49,-0.489 -0.987,-0.891 -1.425,-1.244 -1.201,-0.97 -2.069,-1.67 -2.224,-3.526 l -0.951,0.08 c 0.19,2.262 1.349,3.198 2.576,4.188 0.44,0.355 0.895,0.722 1.349,1.177 l 3.125,3.125 0.32,-0.192 c 0.046,-0.028 4.702,-2.793 8.339,-2.793 3.624,0 7.696,-1.762 8.071,-5.629 L 0,0 Z"/></g><g transform="translate(3.0645,12)" id="g40"><path id="path42" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0.325 -0.064,0.648 -0.064,1 0,5.001 3,-0.563 3,3 0,3.564 2,4.001 4,6.001 l 3,3 c 0,0 5,-3 9,-3 4,0 8,-2.001 8,-6.001 0,-4 3,2.001 3,-3 0,-0.355 -0.034,-0.673 -0.058,-1 l 1.049,0 c 0.009,1.477 0.009,3.132 0.009,5 0,13 -10,18 -16,18 -6,0 -16,-5 -16,-18 0,-1.158 -0.029,-2.986 0.012,-5 L 0,0 Z"/></g><g transform="translate(18,6)" id="g44"><path id="path46" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.347,0 -3.575,1.16 -3.707,1.293 -0.391,0.391 -0.391,1.023 0,1.414 0.387,0.387 1.013,0.39 1.404,0.01 C -2.251,2.67 -1.497,2 0,2 1.519,2 2.273,2.689 2.305,2.719 2.703,3.092 3.332,3.081 3.713,2.689 4.092,2.297 4.093,1.679 3.707,1.293 3.575,1.16 2.347,0 0,0"/></g><g transform="translate(19,11)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(13,14)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.552,4 0,4 0.552,4 1,3.552 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(23,14)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.553,4 0,4 0.553,4 1,3.552 1,3 L 1,1 C 1,0.447 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="M18 3c6 0 16 3 16 16s0 16-3 16-7-3-13-3-9.915 3-13 3c-3.343 0-3-12-3-16C2 6 12 3 18 3z"/><path fill="#FFDC5D" d="M6 18.562c0-8.526 5.373-15.438 12-15.438s12 6.912 12 15.438S24.627 34 18 34 6 27.088 6 18.562z"/><path fill="#FFAC33" d="M13.272 32.665l-.169-.098c-4.102-2.356-6.783-7.384-6.998-13.121.191-2.32 1.35-3.255 2.577-4.246.44-.355.896-.723 1.35-1.177l3.125-3.125.319.191c.047.028 4.703 2.793 8.339 2.793 3.624 0 7.696 1.762 8.071 5.629-.249 5.741-2.927 10.717-6.985 13.052l-.169.098-.188-.049c-1.319-.34-7.771-.338-9.083.003l-.189.05zm.038-20.57l-2.604 2.603c-.49.49-.986.891-1.425 1.245-1.201.969-2.068 1.669-2.224 3.526.201 5.279 2.634 9.947 6.365 12.18 1.716-.322 7.439-.324 9.16-.003 3.69-2.212 6.12-6.831 6.354-12.108-.316-3.208-3.913-4.699-7.12-4.699-3.368-.001-7.349-2.093-8.506-2.744z"/><path fill="#FFDC5D" d="M7.118 20C7.118 12.268 11.99 6 18 6s10.882 6.268 10.882 14c0 7.731-4.873 14-10.882 14-6.01 0-10.882-6.268-10.882-14z"/><path fill="#FFAC33" d="M28.938 19.604c-.318-3.275-3.915-4.767-7.122-4.767-3.367 0-7.349-2.092-8.506-2.743l-2.604 2.603c-.49.49-.986.891-1.425 1.245-1.201.969-2.068 1.669-2.224 3.526l-.95-.08c.19-2.262 1.349-3.198 2.575-4.188.44-.355.896-.723 1.35-1.177l3.125-3.125.319.191c.047.028 4.703 2.793 8.339 2.793 3.624 0 7.696 1.762 8.071 5.629l-.948.093z"/><path fill="#FFE51E" d="M3.064 24c-.03-.325-.064-.647-.064-1 0-5 3 .562 3-3 0-3.563 2-4 4-6l3-3s5 3 9 3 8 2 8 6 3-2 3 3c0 .355-.033.673-.058 1h1.049C34 22.523 34 20.868 34 19 34 6 24 1 18 1S2 6 2 19c0 1.158-.028 2.986.012 5h1.052z"/><path fill="#DF1F32" d="M18 30c-2.347 0-3.575-1.16-3.707-1.293-.391-.391-.391-1.023 0-1.414.387-.387 1.013-.39 1.404-.01.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719.398-.373 1.027-.362 1.408.029.379.393.38 1.011-.006 1.397C21.575 28.84 20.347 30 18 30z"/><path fill="#C1694F" d="M19 25h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path d="M13 22c-.552 0-1-.447-1-1v-2c0-.552.448-1 1-1s1 .448 1 1v2c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2c0 .553-.447 1-1 1z" fill="#662113"/></svg> \ No newline at end of file |