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/1f9e3.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/1f9e3.svg')
-rw-r--r-- | public/emoji/1f9e3.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9e3.svg b/public/emoji/1f9e3.svg index 09643e41a..2c959f447 100644 --- a/public/emoji/1f9e3.svg +++ b/public/emoji/1f9e3.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(13,34)" id="g20"><path id="path22" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,-1 -2.576,-5.03 -3,-8 -1,-7 -1,-18 -1,-18 0,0 2,-1 4,-1 2,0 1,-1 6,-1 0,0 -1.89,22.92 1,27 1.77,2.499 -6,2 -7,1"/></g><g transform="translate(10.4087,30.2696)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.266,-1.306 -2.984,-3.3 -3.409,-6.27 -1,-7 -1,-18 -1,-18 0,0 2,-1 4,-1 2,0 1,-1 6,-1 0,0 -2,23 1,27 C 9.591,4.73 1.225,0.706 0,0"/></g><g transform="translate(13.4825,31.7258)" id="g28"><path id="path30" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.649,-1.212 -3.074,-1.456 -1.423,-0.82 -2.235,-1.913 -2.748,-3.347 1.884,-0.775 5.205,-1.091 7.981,-1.189 0.009,0.097 1.588,1.099 1.588,1.099 L 3.748,-0.4 0,0 Z"/></g><g transform="translate(28.9823,34.3586)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.907,2.759 -6.352,0.92 -9.982,0.92 -3.692,0 -9.016,1.839 -9.939,-0.92 -0.923,-2.76 -4.615,-5.519 0.923,-6.439 5.539,-0.92 9.016,-0.92 9.016,-0.92 0,0 3.63,0 9.075,0.92 C 4.537,-5.519 0.907,-2.76 0,0"/></g><g transform="translate(26.3852,35.1338)" id="g36"><path id="path38" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.923,0 -3.693,-0.751 -7.385,-0.751 -3.692,0 -6.462,0.751 -7.385,0.751 -0.923,0 0.923,-1.772 7.385,-1.772 C -0.923,-1.772 0.923,0 0,0"/></g><g transform="translate(6.2573,1.2822)" id="g40"><path id="path42" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.255,0 -0.472,0.193 -0.497,0.452 -0.555,1.047 -0.569,3.128 -0.263,4.293 -0.192,4.561 0.086,4.722 0.348,4.649 0.615,4.579 0.774,4.306 0.704,4.039 0.431,2.999 0.454,1.009 0.498,0.548 0.525,0.273 0.323,0.028 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g><g transform="translate(7.8257,0.9004)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.254,0 -0.472,0.193 -0.497,0.452 -0.057,0.584 -0.066,2.515 0.246,3.829 0.063,0.27 0.333,0.44 0.602,0.371 C 0.62,4.589 0.786,4.319 0.722,4.051 0.445,2.885 0.45,1.049 0.498,0.548 0.525,0.273 0.323,0.029 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g><g transform="translate(9.5088,0.5518)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.254,0 -0.472,0.193 -0.497,0.452 -0.541,0.905 -0.596,3.053 -0.271,4.429 -0.208,4.698 0.062,4.869 0.33,4.801 0.599,4.737 0.765,4.469 0.702,4.2 0.426,3.029 0.452,1.024 0.498,0.548 0.525,0.273 0.323,0.029 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g><g transform="translate(11.3662,0.3828)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.309 -0.007,0.587 -0.013,0.851 -0.023,0.911 -0.042,1.697 0.242,2.927 0.063,0.269 0.328,0.436 0.6,0.375 C 0.598,4.591 0.766,4.322 0.704,4.054 0.448,2.946 0.465,2.253 0.486,1.375 0.493,1.105 0.5,0.817 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(13.2393,0.0117)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.254,0 -0.472,0.193 -0.497,0.452 -0.551,1.013 -0.511,2.814 -0.283,4.077 -0.233,4.35 0.029,4.524 0.298,4.48 0.57,4.432 0.75,4.171 0.702,3.899 0.479,2.665 0.458,0.97 0.498,0.548 0.525,0.273 0.323,0.029 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g><g transform="translate(15.4478,0.1064)" id="g60"><path id="path62" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.255,0 -0.472,0.193 -0.497,0.452 -0.034,0.349 -0.022,1.142 -0.007,2.06 0.007,0.502 0.015,1.022 0.015,1.476 0,0.277 0.224,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 C 0.511,3.529 0.503,3.004 0.496,2.496 0.483,1.683 0.47,0.841 0.498,0.548 0.525,0.273 0.323,0.028 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g><g transform="translate(18.5986,1.6621)" id="g64"><path id="path66" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.254,0 -0.472,0.193 -0.497,0.452 -0.05,0.522 -0.143,2.261 -0.143,3.535 0,0.277 0.223,0.5 0.5,0.5 0.276,0 0.5,-0.223 0.5,-0.5 C 0.36,2.763 0.451,1.04 0.498,0.548 0.524,0.273 0.323,0.029 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g><g transform="translate(16.9536,1.7559)" id="g68"><path id="path70" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.254,0 -0.472,0.193 -0.497,0.452 -0.05,0.522 -0.143,2.261 -0.143,3.536 0,0.277 0.223,0.5 0.5,0.5 0.276,0 0.5,-0.223 0.5,-0.5 C 0.36,2.763 0.451,1.04 0.498,0.548 0.525,0.273 0.323,0.029 0.048,0.002 0.032,0.001 0.016,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#A0041E" d="M13 2c-1 1-2.576 5.03-3 8-1 7-1 18-1 18s2 1 4 1 1 1 6 1c0 0-1.89-22.92 1-27 1.77-2.499-6-2-7-1z"/><path fill="#DD2E44" d="M10.409 5.73C8.143 7.036 7.424 9.03 7 12c-1 7-1 18-1 18s2 1 4 1 1 1 6 1c0 0-2-23 1-27s-5.366.024-6.591.73z"/><path fill="#A0041E" d="M13.483 4.274s-2.649 1.212-3.074 1.456c-1.423.82-2.235 1.913-2.748 3.347 1.884.775 5.204 1.09 7.98 1.188.01-.096 1.588-1.099 1.588-1.099l.001-4.493-3.747-.399z"/><path fill="#DD2E44" d="M28.982 1.641C28.075-1.118 22.63.722 19 .722c-3.692 0-9.016-1.84-9.939.92-.923 2.759-4.615 5.518.923 6.438C15.523 9 19 9 19 9s3.63 0 9.075-.92c5.445-.92 1.815-3.679.907-6.439z"/><path fill="#A0041E" d="M26.385.866c-.923 0-3.693.751-7.385.751S12.538.866 11.615.866 12.538 2.638 19 2.638 27.308.866 26.385.866z"/><path fill="#DD2E44" d="M6.257 34.718c-.255 0-.472-.193-.497-.452-.058-.595-.072-2.676.234-3.841.07-.268.349-.429.61-.356.267.07.427.344.356.61-.273 1.04-.25 3.03-.206 3.491.027.274-.175.52-.45.546l-.047.002zm1.569.382c-.254 0-.472-.193-.497-.452-.057-.584-.066-2.515.246-3.829.063-.27.333-.439.602-.371.269.063.435.333.371.601-.276 1.166-.272 3.002-.224 3.503.027.274-.175.519-.45.546l-.048.002zm1.683.348c-.254 0-.472-.193-.497-.452-.044-.453-.099-2.601.226-3.977.063-.27.333-.44.602-.372.269.063.435.332.372.601-.276 1.171-.25 3.176-.204 3.652.027.274-.175.519-.45.546l-.049.002zm1.857.169c-.276 0-.5-.224-.5-.5 0-.309-.007-.587-.013-.851-.022-.911-.042-1.697.242-2.928.062-.269.328-.436.6-.375.269.062.436.331.375.6-.256 1.107-.239 1.801-.217 2.679.007.271.014.558.014.875-.001.277-.224.5-.501.5zm1.873.371c-.254 0-.472-.193-.497-.452-.054-.56-.014-2.362.214-3.625.049-.272.312-.447.581-.403.272.049.452.31.403.581-.223 1.234-.244 2.93-.204 3.351.027.274-.175.519-.45.546l-.047.002zm2.209-.094c-.255 0-.472-.193-.497-.452-.034-.349-.021-1.142-.007-2.06.008-.502.016-1.022.016-1.477 0-.276.224-.5.5-.5s.5.224.5.5c0 .459-.008.984-.016 1.492-.013.813-.026 1.655.002 1.948.027.274-.175.52-.45.546l-.048.003z"/><path fill="#A0041E" d="M18.599 34.338c-.254 0-.472-.193-.497-.452-.05-.521-.143-2.261-.143-3.535 0-.276.224-.5.5-.5s.5.224.5.5c0 1.225.091 2.947.138 3.439.026.274-.175.519-.45.546l-.048.002zm-1.645-.094c-.254 0-.472-.193-.497-.452-.05-.521-.143-2.261-.143-3.536 0-.276.224-.5.5-.5s.5.224.5.5c0 1.226.091 2.948.138 3.44.027.274-.175.519-.45.546l-.048.002z"/></svg> \ No newline at end of file |