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/1f378.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/1f378.svg')
-rw-r--r-- | public/emoji/1f378.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f378.svg b/public/emoji/1f378.svg index ed6ca0eb0..c8bc0ce10 100644 --- a/public/emoji/1f378.svg +++ b/public/emoji/1f378.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(19,15.7451)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 11.458,11.041 12.583,12.005 1.125,0.964 -0.708,2.25 -2.957,2.25 l -10.124,0 -1.125,0 -1.125,0 -10.123,0 c -1.125,0 -4.483,-0.73 -2.796,-2.417 C -14.463,10.635 -3,0 -3,0 l 0,-10.123 c 0,0 -4.584,-2.34 -5.498,-2.883 -0.984,-0.562 -0.33,-1.462 0.063,-1.617 0.657,-0.258 2.254,-1.102 6.781,-1.102 4.64,0 6.202,0.914 6.764,1.102 0.217,0.072 1.347,0.932 0.011,1.723 C 2.743,-11.492 0,-10.123 0,-10.123 L 0,0 Z"/></g><g transform="translate(32,28.5576)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.621 -6.547,-2.935 -14.623,-2.935 -8.076,0 -14.623,1.314 -14.623,2.935 0,1.622 6.547,2.935 14.623,2.935 C -6.547,2.935 0,1.622 0,0"/></g><g transform="translate(4.4585,28.4165)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.265,-1.232 8.537,-7.235 11.699,-9.835 0.9,-0.742 2.135,-0.623 2.801,-0.123 0.667,0.5 11.167,9.583 11.167,9.583 L 0,0 Z"/></g><g transform="translate(16.8677,19.4678)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.237,0.124 -0.05,0.8 0.248,1.328 l 7.449,14.518 c 0.3,0.529 0.969,0.715 1.498,0.416 0.529,-0.299 0.714,-0.969 0.416,-1.498 L 0.943,0.879 C 0.793,0.615 0.27,-0.141 0,0"/></g><g transform="translate(21.7451,28.1445)" id="g36"><path id="path38" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.133,-0.639 1.996,-2.636 1.2,-4.046 0.403,-5.457 -1.754,-5.745 -2.887,-5.105 -4.019,-4.465 -4.952,-2.59 -4.086,-1.059 -3.221,0.473 -1.133,0.64 0,0"/></g><g transform="translate(16.7969,25.2388)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.775,0 -7.361,0.49 -10.737,1.471 l -0.129,0.037 c -0.531,0.154 -0.836,0.708 -0.683,1.239 0.152,0.53 0.705,0.836 1.238,0.683 l 0.132,-0.038 C -3.646,1.493 3.764,1.537 11.839,3.524 12.382,3.654 12.918,3.328 13.049,2.791 13.181,2.255 12.854,1.713 12.317,1.582 8.029,0.527 3.914,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M19 20.255S30.458 9.214 31.583 8.25 30.875 6 28.626 6H6.129c-1.125 0-4.483.729-2.796 2.417C4.537 9.62 16 20.255 16 20.255v10.123s-4.584 2.34-5.498 2.883c-.984.562-.33 1.462.063 1.617.656.258 2.253 1.102 6.78 1.102 4.641 0 6.202-.914 6.765-1.102.217-.072 1.347-.932.011-1.723C21.743 31.747 19 30.378 19 30.378V20.255z"/><path fill="#CCD6DD" d="M32 7.442c0-1.622-6.547-2.935-14.623-2.935S2.754 5.82 2.754 7.442c0 .756 1.436 1.443 3.775 1.963 2.746 2.341 7.298 6.098 9.627 8.013.9.741 2.135.623 2.801.123.503-.377 6.606-5.643 9.57-8.203C30.69 8.827 32 8.166 32 7.442z"/><path fill="#662113" d="M16.868 16.532c-.237-.125-.05-.8.248-1.328L24.564.686c.3-.529.97-.715 1.498-.416.529.299.714.969.416 1.498l-8.667 13.885c-.15.264-.674 1.02-.943.879z"/><path fill="#5C913B" d="M21.745 7.855c1.133.639 1.996 2.636 1.2 4.046-.797 1.411-2.954 1.699-4.087 1.059-1.132-.64-2.065-2.515-1.199-4.046.865-1.531 2.953-1.699 4.086-1.059z"/><path fill="#FFF" d="M16.797 10.761c-3.775 0-7.361-.49-10.737-1.471l-.129-.037c-.531-.153-.836-.708-.683-1.238.152-.531.705-.837 1.238-.684l.132.039c6.533 1.898 13.942 1.855 22.018-.132.543-.13 1.079.196 1.21.732.132.536-.195 1.078-.731 1.21-4.289 1.054-8.404 1.581-12.318 1.581z"/></svg> \ No newline at end of file |