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/1f624.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/1f624.svg')
-rw-r--r-- | public/emoji/1f624.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f624.svg b/public/emoji/1f624.svg index a3b73f63e..c211eec53 100644 --- a/public/emoji/1f624.svg +++ b/public/emoji/1f624.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,18)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(20.001,23)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.055,0 -0.109,0.004 -0.165,0.014 -0.71,0.105 -1.078,0.62 -0.987,1.165 -0.594,3.529 1.583,8 6.999,8 c 0.553,0 1,-0.448 1,-1 0,-0.552 -0.447,-1 -1,-1 C 1.904,6 1.02,1.046 0.985,0.835 0.904,0.347 0.48,0 0,0"/></g><g transform="translate(15.999,23)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.479,0 -0.902,0.345 -0.985,0.833 -1.021,1.044 -1.94,6 -6.999,6 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 C -1.583,8 0.593,3.529 0.987,1.165 1.078,0.62 0.71,0.105 0.166,0.014 0.11,0.004 0.054,0 0,0"/></g><g transform="translate(11.4097,18.1079)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.335,0 -3.87,0.997 -3.964,1.06 -0.46,0.306 -0.584,0.927 -0.278,1.387 0.306,0.46 0.927,0.585 1.387,0.277 C -2.756,2.66 -0.253,1.088 3.143,2.787 3.638,3.034 4.238,2.833 4.485,2.339 4.732,1.845 4.532,1.245 4.038,0.998 2.544,0.251 1.171,0 0,0"/></g><g transform="translate(24.5908,18.1079)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.172,0 -2.545,0.251 -4.038,0.998 -0.494,0.247 -0.694,0.847 -0.447,1.341 0.248,0.495 0.847,0.695 1.341,0.448 C 0.257,1.087 2.756,2.661 2.86,2.728 3.32,3.026 3.941,2.898 4.242,2.439 4.544,1.98 4.421,1.365 3.964,1.06 3.869,0.997 2.334,0 0,0"/></g><g transform="translate(26.001,9)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.305,0 -0.605,0.138 -0.801,0.4 -0.025,0.034 -2.782,3.6 -7.2,3.6 -4.418,0 -7.174,-3.566 -7.202,-3.602 -0.333,-0.438 -0.961,-0.526 -1.4,-0.195 -0.44,0.332 -0.529,0.956 -0.198,1.397 0.135,0.179 3.362,4.4 8.8,4.4 5.437,0 8.665,-4.221 8.8,-4.4 C 1.131,1.158 1.041,0.531 0.599,0.2 0.419,0.065 0.209,0 0,0"/></g><g transform="translate(15.3911,15.9199)" id="g44"><path id="path46" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.453,0.195 -0.979,0.027 -1.239,-0.39 l -5,-8 c -0.193,-0.308 -0.203,-0.697 -0.027,-1.014 0.177,-0.319 0.511,-0.516 0.875,-0.516 l 3,0 c 0.459,0 0.859,0.313 0.97,0.758 l 2,8 C 0.698,-0.686 0.453,-0.192 0,0"/></g><g transform="translate(26.8477,7.5303)" id="g48"><path id="path50" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5,8 C -5.262,8.418 -5.787,8.584 -6.238,8.39 -6.691,8.197 -6.937,7.704 -6.817,7.228 l 2,-8 c 0.111,-0.446 0.51,-0.758 0.969,-0.758 l 3,0 c 0.364,0 0.698,0.197 0.875,0.515 C 0.203,-0.697 0.193,-0.309 0,0"/></g><g transform="translate(31.9824,5.8223)" id="g52"><path id="path54" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.003,0.06 0.018,0.117 0.018,0.178 0,1.656 -1.344,3 -3,3 -1.028,0 -1.932,-0.518 -2.473,-1.305 -0.471,0.194 -0.986,0.305 -1.527,0.305 -2.209,0 -4,-1.791 -4,-4 0,-2.209 1.791,-4 4,-4 1.365,0 2.568,0.686 3.29,1.731 0.479,-1.02 1.507,-1.731 2.71,-1.731 1.657,0 3,1.343 3,3 C 2.018,-1.511 1.172,-0.408 0,0"/></g><g transform="translate(11,8)" id="g56"><path id="path58" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.542,0 -1.056,-0.11 -1.527,-0.305 -2.068,0.482 -2.973,1 -4,1 -5.656,1 -7,-0.344 -7,-2 -7,-2.061 -6.986,-2.118 -6.982,-2.178 -8.154,-2.586 -9,-3.688 -9,-5 c 0,-1.657 1.343,-3 3,-3 1.202,0 2.231,0.711 2.709,1.731 C -2.568,-7.313 -1.366,-8 0,-8 c 2.209,0 4,1.791 4,4 0,2.209 -1.791,4 -4,4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><path fill="#664500" d="M20.001 13c-.055 0-.109-.004-.165-.014-.545-.091-.913-.606-.822-1.151C19.407 9.471 21.584 5 27 5c.553 0 1 .448 1 1s-.447 1-1 1c-5.095 0-5.979 4.954-6.014 5.165-.081.488-.505.835-.985.835zm-4.002 0c-.479 0-.902-.345-.985-.833C14.977 11.957 14.059 7 9 7c-.552 0-1-.448-1-1s.448-1 1-1c5.416 0 7.592 4.471 7.986 6.835.091.545-.277 1.06-.822 1.151-.055.01-.111.014-.165.014zm-4.589 4.892c-2.335 0-3.87-.997-3.964-1.06-.459-.306-.583-.927-.277-1.387.306-.46.926-.585 1.387-.277.099.064 2.602 1.636 5.998-.062.495-.247 1.095-.046 1.342.447.247.494.047 1.095-.447 1.342-1.495.746-2.868.997-4.039.997zm13.181 0c-1.172 0-2.545-.251-4.038-.998-.494-.247-.694-.848-.447-1.342.248-.494.848-.694 1.342-.447 3.4 1.7 5.899.126 6.004.059.46-.298 1.081-.17 1.382.289.302.459.179 1.074-.278 1.379-.096.063-1.631 1.06-3.965 1.06zM26.001 27c-.305 0-.604-.138-.801-.4-.025-.034-2.782-3.6-7.2-3.6-4.417 0-7.174 3.566-7.202 3.603-.333.438-.961.525-1.4.194-.44-.332-.529-.956-.198-1.397.135-.18 3.362-4.4 8.8-4.4s8.665 4.221 8.8 4.4c.332.441.242 1.068-.2 1.399-.18.136-.39.201-.599.201z"/><path fill="#F5F8FA" d="M15.391 20.08c-.453-.195-.979-.027-1.239.39l-5 8c-.192.309-.203.697-.026 1.015.176.318.51.515.874.515h3c.459 0 .859-.312.97-.758l2-8c.119-.476-.126-.97-.579-1.162zm11.457 8.39l-5-8c-.262-.418-.787-.584-1.238-.39-.453.192-.699.686-.579 1.162l2 8c.111.446.51.758.969.758h3c.363 0 .698-.197.875-.516.176-.317.166-.706-.027-1.014z"/><path fill="#E1E8ED" d="M31.982 30.178c.003-.06.018-.117.018-.178 0-1.656-1.344-3-3-3-1.027 0-1.932.518-2.473 1.305C26.057 28.11 25.541 28 25 28c-2.209 0-4 1.791-4 4s1.791 4 4 4c1.365 0 2.568-.687 3.29-1.731C28.77 35.289 29.798 36 31 36c1.657 0 3-1.343 3-3 0-1.312-.846-2.414-2.018-2.822zM11 28c-.542 0-1.056.11-1.527.305C8.932 27.518 8.027 27 7 27c-1.656 0-3 1.344-3 3 0 .061.014.118.018.178C2.846 30.586 2 31.688 2 33c0 1.657 1.343 3 3 3 1.202 0 2.231-.711 2.709-1.731C8.432 35.313 9.634 36 11 36c2.209 0 4-1.791 4-4s-1.791-4-4-4z"/></svg> \ No newline at end of file |