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/1f6b2.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/1f6b2.svg')
-rw-r--r-- | public/emoji/1f6b2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6b2.svg b/public/emoji/1f6b2.svg index e5638ad79..b3626aeec 100644 --- a/public/emoji/1f6b2.svg +++ b/public/emoji/1f6b2.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(7.0005,12)" id="g20"><path id="path22" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.957,0 3.633,-1.135 4.455,-2.773 l 3.477,1.74 C 6.488,1.942 3.446,4 -0.084,4 -1.386,4 -2.619,3.715 -3.733,3.213 l 1.668,-3.67 C -1.434,-0.17 -0.739,0 0,0"/></g><g transform="translate(29,12)" id="g24"><path id="path26" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.467,0 2.773,-0.643 3.688,-1.648 L 6.585,0.986 C 4.952,2.831 2.573,4 -0.084,4 -3.66,4 -6.736,1.889 -8.157,-1.15 l 3.648,-1.722 C -3.707,-1.18 -1.997,0 0,0"/></g><g transform="translate(7.0005,2)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 C 2.761,10 5,7.762 5,5 5,2.238 2.761,0 0,0 m 0,12 c -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 0,3.866 -3.134,7 -7,7"/></g><g transform="translate(29,2)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 C 2.762,10 5,7.762 5,5 5,2.238 2.762,0 0,0 m 0,12 c -3.865,0 -7,-3.134 -7,-7 0,-3.866 3.135,-7 7,-7 3.867,0 7,3.134 7,7 0,3.866 -3.133,7 -7,7"/></g><g transform="translate(29.9844,7.0781)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.005,0.067 -0.021,0.132 -0.04,0.198 -0.02,0.066 -0.04,0.126 -0.071,0.186 -0.013,0.024 -0.015,0.052 -0.03,0.075 l -7,11 c -0.296,0.465 -0.914,0.603 -1.38,0.306 -0.299,-0.19 -0.445,-0.513 -0.446,-0.843 l -9.017,0 c -0.553,0 -1,-0.447 -1,-1 l 0,0 c 0,-0.553 0.447,-1 1,-1 l 10,0 c 0.027,0 0.049,0.014 0.077,0.016 l 5.1,-8.016 -9.177,0 c -0.553,0 -1,-0.447 -1,-1 0,-0.553 0.447,-1 1,-1 l 11,0 0.001,0 c 0.116,0 0.23,0.028 0.342,0.069 0.034,0.013 0.065,0.028 0.097,0.043 0.031,0.017 0.065,0.025 0.097,0.044 0.03,0.02 0.048,0.051 0.075,0.072 0.055,0.044 0.103,0.089 0.147,0.143 0.041,0.049 0.075,0.099 0.105,0.154 0.03,0.056 0.054,0.111 0.075,0.172 0.022,0.067 0.033,0.132 0.04,0.201 0.004,0.035 0.021,0.066 0.021,0.102 C 0.016,-0.051 0.002,-0.027 0,0"/></g><g transform="translate(21.5811,20)" id="g40"><path id="path42" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.9,-8.117 -5.928,6.775 c -0.364,0.415 -0.996,0.459 -1.411,0.094 -0.416,-0.364 -0.458,-0.995 -0.094,-1.411 l 6.664,-7.615 -0.854,-2.39 c -0.185,-0.52 0.086,-1.092 0.606,-1.277 0.111,-0.04 0.224,-0.059 0.336,-0.059 0.41,0 0.796,0.255 0.942,0.664 L 2.124,0 0,0 Z"/></g><g transform="translate(6.9995,6)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.15,0 -0.303,0.034 -0.446,0.105 -0.94,0.352 -1.141,0.953 -0.894,1.447 l 3.062,6.107 c 0.019,0.027 1.833,2.795 1.833,5.445 0,3.242 -2.293,4.044 -2.316,4.052 -0.524,0.175 -0.808,0.741 -0.633,1.265 0.175,0.523 0.739,0.81 1.265,0.632 0.151,-0.05 3.684,-1.281 3.684,-5.949 C 6.001,9.932 4.165,6.958 3.87,6.502 L 0.896,0.553 C 0.72,0.202 0.367,0 0,0"/></g><g transform="translate(14.6123,22.3374)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.054,0 -0.11,0.004 -0.165,0.014 l -6.001,1 c -0.544,0.09 -0.912,0.606 -0.821,1.151 0.091,0.543 0.601,0.913 1.151,0.821 l 6,-1 C 0.708,1.895 1.076,1.38 0.985,0.835 0.904,0.347 0.48,0 0,0"/></g><g transform="translate(26.3828,19)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0 -0.059,0.002 -0.089,0.006 l -5.672,0.708 c -0.372,0.047 -0.643,0.374 -0.62,0.748 0.024,0.374 0.333,0.664 0.707,0.665 0.041,0 4.068,0.018 5.989,1.299 C 0.565,3.594 0.898,3.583 1.14,3.4 1.379,3.215 1.477,2.899 1.381,2.612 L 0.672,0.485 C 0.575,0.192 0.302,0 0,0"/></g><g transform="translate(20,7)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -1.999,-2 -1.105,0 -2,0.896 -2,2 0,1.105 0.895,2 2,2 C -0.895,2 0,1.105 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EA596E" d="M7 24c1.957 0 3.633 1.135 4.455 2.772l3.477-1.739C13.488 22.058 10.446 20 6.916 20c-1.301 0-2.534.285-3.649.787l1.668 3.67C5.566 24.17 6.262 24 7 24zm22 0c1.467 0 2.772.643 3.688 1.648l2.897-2.635C33.952 21.169 31.573 20 28.916 20c-3.576 0-6.652 2.111-8.073 5.15l3.648 1.722C25.293 25.18 27.003 24 29 24z"/><path fill="#292F33" d="M7 22c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.133-7-7-7zm0 12c-2.761 0-5-2.238-5-5s2.239-5 5-5 5 2.238 5 5-2.238 5-5 5zm22-12c-3.865 0-7 3.134-7 7s3.135 7 7 7c3.867 0 7-3.134 7-7s-3.133-7-7-7zm0 12c-2.761 0-5-2.238-5-5s2.239-5 5-5c2.762 0 5 2.238 5 5s-2.238 5-5 5z"/><path fill="#DD2E44" d="M29.984 28.922c-.005-.067-.021-.132-.04-.198-.019-.065-.04-.126-.071-.186-.013-.024-.015-.052-.029-.075l-7-11c-.297-.466-.914-.604-1.381-.307-.299.19-.444.513-.445.843H12c-.552 0-1 .447-1 1 0 .553.448 1 1 1h10c.027 0 .05-.014.077-.016L27.178 28H18c-.552 0-1 .447-1 1s.448 1 1 1h11.001c.116 0 .23-.028.343-.069.034-.013.064-.027.097-.043.031-.017.066-.024.097-.044.03-.02.048-.051.075-.072.055-.044.103-.089.147-.143.041-.049.074-.099.104-.154.03-.056.055-.11.075-.172.021-.066.033-.132.04-.201.004-.036.021-.066.021-.102 0-.027-.014-.051-.016-.078z"/><path fill="#DD2E44" d="M21.581 16l-2.899 8.117-5.929-6.775c-.364-.415-.996-.459-1.411-.094-.415.364-.457.995-.094 1.411l6.664 7.615-.854 2.39c-.185.519.086 1.092.606 1.277.111.04.224.059.336.059.411 0 .796-.255.942-.664L23.705 16h-2.124z"/><path fill="#DD2E44" d="M7 30c-.15 0-.303-.034-.446-.105-.494-.247-.694-.848-.447-1.342l3.062-6.106C9.186 22.419 11 19.651 11 17c0-3.242-2.293-4.043-2.316-4.051-.524-.175-.807-.741-.632-1.265.174-.524.739-.81 1.265-.632C9.467 11.102 13 12.333 13 17c0 3.068-1.836 6.042-2.131 6.497l-2.974 5.949C7.72 29.798 7.367 30 7 30z"/><path fill="#292F33" d="M14.612 13.663c-.054 0-.11-.004-.165-.014l-6-1c-.544-.091-.913-.606-.822-1.151.091-.544.601-.913 1.151-.822l6 1c.544.091.913.606.822 1.151-.082.489-.506.836-.986.836zM26.383 17c-.03 0-.059-.002-.089-.006l-5.672-.708c-.372-.046-.644-.374-.62-.748.023-.374.333-.665.707-.665.041 0 4.067-.018 5.989-1.299.25-.167.582-.157.824.026.239.185.337.501.241.788l-.709 2.127c-.096.293-.369.485-.671.485z"/><path fill="#66757F" d="M20 29c0 1.104-.895 2-2 2-1.104 0-2-.896-2-2s.896-2 2-2c1.105 0 2 .896 2 2z"/></svg> \ No newline at end of file |