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/1f32a.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/1f32a.svg')
-rw-r--r-- | public/emoji/1f32a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f32a.svg b/public/emoji/1f32a.svg index ca5c1694a..b4620106b 100644 --- a/public/emoji/1f32a.svg +++ b/public/emoji/1f32a.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 21,36 C 11.584,36 7.375,33.834 6.25,32 l 0,0 C 5.305,30.461 5.625,27.292 8.75,23 l 0,0 c 2.655,-3.646 5.331,-4.477 6.042,-8.583 l 0,0 C 15.709,9.125 12.125,3.333 12.125,3.333 l 0,0 c 0,0 -0.928,-2.879 2.625,-1.333 l 0,0 c 4.5,1.958 9.36,7.55 13.75,15.916 l 0,0 c 2.667,5.084 3.333,12.459 2.208,14.668 l 0,0 C 29.794,34.378 27.042,36 21,36 Z"/></clipPath><clipPath id="clipPath36" clipPathUnits="userSpaceOnUse"><path id="path38" d="m 3.125,42.75 29.834,0 0,-13.0835 -29.834,0 0,13.0835 z"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" 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(12.125,3.333)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3.583,5.792 2.667,11.084 -0.711,4.106 -3.387,4.937 -6.042,8.583 -3.125,4.292 -3.444,7.461 -2.5,9 1.125,1.834 5.333,4 14.75,4 6.042,0 8.794,-1.622 9.708,-3.416 1.125,-2.209 0.459,-9.584 -2.208,-14.667 C 11.985,6.217 7.125,0.625 2.625,-1.333 -0.928,-2.879 0,0 0,0"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g id="g32"><g id="g34"/><g id="g40"><g style="opacity:0.19999701" id="g42" clip-path="url(#clipPath36)"><g id="g44" transform="translate(32.959,33.625)"><path id="path46" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.915,-1.088 -3.25,0.167 -3.334,1.791 -11.297,2.141 -17.542,0.291 -5.209,-1.541 -1.761,-4.174 8.792,-2.666 2.625,0.375 2.5,1.708 -3.292,1.458 -0.849,-0.037 8.458,0.5 8.458,0.5 L -9.292,-3.5 -26.001,-3.958 -29.834,-1.833 -4.75,9.125 0,0 Z"/></g></g></g></g><g transform="translate(13.7827,27.9038)" id="g48"><path id="path50" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.301,0 -8.381,0.856 -9.381,2.596 -0.617,1.075 -0.256,2.161 0.055,2.633 0.304,0.461 0.924,0.589 1.385,0.286 0.455,-0.3 0.586,-0.908 0.297,-1.367 -0.041,-0.073 -0.151,-0.314 0.008,-0.573 0.288,-0.47 1.927,-1.966 10.883,-1.48 4.57,0.246 7.833,1.281 7.762,2 C 10.936,4.846 8.286,5.253 3.235,4.895 1.676,4.784 -0.678,4.547 -0.741,5.096 -0.803,5.645 1.369,5.969 3.051,6.159 8.592,6.784 11.883,6.489 12.824,5.101 13.177,4.58 13.214,3.948 12.926,3.367 12.086,1.675 8.24,0.361 3.355,0.098 2.151,0.033 1.033,0 0,0"/></g><g transform="translate(15.2764,20.168)" id="g52"><path id="path54" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -7.378,0 -9.446,3.434 -9.551,3.617 -9.825,4.097 -9.658,4.708 -9.179,4.981 -8.704,5.253 -8.1,5.092 -7.822,4.622 -7.758,4.524 -5.026,0.332 5.942,2.441 6.481,2.545 9.005,3.254 9.146,2.582 9.259,2.042 7.38,1.295 6.849,1.145 3.974,0.332 1.929,0 0,0"/></g><g transform="translate(13.3906,25.0312)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.047,0.609 2.079,0.708 2.688,0.766 10.796,1.031 13.342,3.471 14.296,4.975 0.852,1.341 0.41,2.481 0.391,2.529 -0.204,0.507 0.034,1.091 0.539,1.302 0.502,0.211 1.081,-0.015 1.3,-0.516 C 19.25,8.972 20.093,6.977 18.718,4.741 16.695,1.45 11.641,-0.141 2.797,-0.672 2.777,-0.673 0.072,-0.94 0,0"/></g><g transform="translate(18.8306,13.0322)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.294,0 -6.843,3.087 -6.887,3.482 -0.061,0.548 0.334,1.043 0.883,1.105 0.528,0.058 1.02,-0.315 1.1,-0.844 C -4.874,3.63 -4.253,1.515 2.482,1.608 3.042,1.616 4.577,1.814 4.638,1.265 4.7,0.716 3.497,0.249 2.687,0.161 1.692,0.053 0.799,0 0,0"/></g><g transform="translate(18.4219,18.1875)" id="g64"><path id="path66" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.047,0.594 1.669,0.686 2.219,0.734 8.031,0.703 10.069,4.818 10.172,5 0.268,0.479 0.873,0.654 1.357,0.389 C 14.229,5.856 14.407,5.255 14.143,4.772 14.023,4.55 11.167,-0.419 2.266,-0.781 2.252,-0.782 -0.07,-0.889 0,0"/></g><g transform="translate(17.0625,5.9062)" id="g68"><path id="path70" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.609,0.078 -2.759,0.448 -3.578,1.344 -4.801,2.68 -4.609,4.314 -4.588,4.51 -4.531,5.06 -4.049,5.463 -3.49,5.4 -2.943,5.344 -2.545,4.856 -2.599,4.31 -2.601,4.277 -2.676,3.242 -2.045,2.563 -1.605,2.091 -1.094,1.578 0.109,1.484 1.312,1.391 1.781,1.328 1.812,0.937 1.877,0.127 0.529,-0.025 0,0"/></g><g transform="translate(19.7344,9.3496)" id="g72"><path id="path74" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.316,0 -0.641,0.009 -0.977,0.027 -0.551,0.03 -1.756,0.369 -1.726,0.92 0.03,0.552 1.316,0.602 1.859,0.641 C 5.281,2.025 6.898,4.848 6.97,4.982 7.225,5.465 7.827,5.66 8.313,5.41 8.801,5.159 8.999,4.568 8.754,4.078 8.667,3.904 6.634,0 0,0"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(28.6416,0)" id="g84"><path id="path86" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.01,0.083 0.025,0.164 0.025,0.25 0,0.979 -0.652,1.795 -1.542,2.064 -0.21,1.953 -1.845,3.478 -3.853,3.478 -1.406,0 -2.627,-0.751 -3.313,-1.867 -0.448,0.281 -0.974,0.45 -1.543,0.45 -1.102,0 -2.05,-0.619 -2.546,-1.521 -0.523,0.549 -1.258,0.896 -2.078,0.896 -0.288,0 -0.56,-0.055 -0.822,-0.134 -0.34,0.253 -0.736,0.43 -1.171,0.504 -0.594,1.536 -2.075,2.63 -3.82,2.63 -1.985,0 -3.64,-1.409 -4.021,-3.281 -0.104,0.012 -0.205,0.031 -0.312,0.031 -1.369,0 -2.479,-1.11 -2.479,-2.479 0,-0.365 0.083,-0.709 0.225,-1.021 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M12.125 32.667s3.583-5.792 2.667-11.084c-.711-4.106-3.387-4.937-6.042-8.583-3.125-4.292-3.444-7.461-2.5-9C7.375 2.167 11.583 0 21 0c6.042 0 8.794 1.622 9.708 3.417 1.125 2.208.459 9.583-2.208 14.666C24.11 26.45 19.25 32.042 14.75 34c-3.553 1.546-2.625-1.333-2.625-1.333z"/><g fill="#66757F"><path d="M17.137 7.999c4.885-.263 8.732-1.577 9.572-3.269.288-.581.251-1.213-.103-1.734-.94-1.388-4.231-1.683-9.773-1.058-1.681.189-3.854.513-3.791 1.062.063.549 2.417.312 3.976.202.693-.049 1.336-.083 1.939-.104 3.787-.135 5.773.256 5.836.904.07.719-3.192 1.753-7.762 2-8.958.485-10.596-1.011-10.885-1.481-.038-.062-.059-.122-.07-.18-.272.625-.368 1.452-.225 2.457 1.578.862 4.19 1.298 7.931 1.298 1.034 0 2.152-.033 3.355-.097zm4.988 6.689c.531-.15 2.41-.897 2.297-1.438-.141-.672-2.664.037-3.203.141-8.814 1.695-12.304-.676-13.37-1.725.271.432.567.875.901 1.334.662.91 1.326 1.644 1.961 2.298 1.229.321 2.733.534 4.566.534 1.928 0 3.973-.332 6.848-1.144z"/><path d="M30.375 5.228c-.954 1.504-3.5 3.944-14.297 4.975-.608.058-2.734.156-2.688.766.072.94 2.777.673 2.797.672 7.749-.465 12.588-1.745 15.028-4.268.05-1.466-.062-2.71-.337-3.532-.044.401-.181.879-.503 1.387zM14.792 21.583c.047.271.075.545.099.818.966.337 2.237.567 3.939.567.799 0 1.692-.053 2.687-.161.811-.088 2.013-.555 1.951-1.103-.062-.549-1.597-.352-2.156-.344-4.707.066-6.424-.947-7.044-1.602.223.536.404 1.131.524 1.825zm5.849-4.505c-.55.048-2.172.141-2.219.734-.07.889 2.252.782 2.266.781 4.058-.165 6.849-1.289 8.708-2.482.446-1.133.805-2.323 1.087-3.508-.831 1.169-3.415 3.912-9.842 4.475zm-1.766 12.078c-.031-.391-.5-.453-1.703-.547-1.203-.094-1.715-.606-2.154-1.079-.256-.275-.393-.608-.468-.91-.198.864-.452 1.681-.723 2.42.791.67 1.83.985 3.236 1.053.529.026 1.877-.126 1.812-.937zm7.056-6.577c-.984.907-3.054 2.199-7.04 2.484-.543.039-1.829.089-1.859.641-.03.552 1.175.891 1.727.92.336.019.661.027.977.027 1.479 0 2.719-.201 3.77-.504.814-1.096 1.624-2.286 2.425-3.568z"/></g><path fill="#788895" d="M12.167 1.917c6.245-1.849 14.208-1.5 17.542.292.026.014.046.019.071.032C28.371.971 25.672 0 21 0 11.583 0 7.375 2.167 6.25 4c-.065.105-.122.22-.174.341.012.058.033.119.071.181.288.47 1.927 1.965 10.883 1.48 4.57-.247 7.833-1.281 7.762-2-.063-.648-2.049-1.039-5.836-.904 4.492-.008 4.414 1.142 2.003 1.486-10.553 1.507-14.001-1.126-8.792-2.667z"/><path fill="#CCD6DD" d="M28.642 36c.01-.083.025-.164.025-.25 0-.979-.652-1.795-1.542-2.064-.211-1.952-1.846-3.478-3.854-3.478-1.406 0-2.627.751-3.312 1.867-.448-.281-.975-.45-1.543-.45-1.103 0-2.051.619-2.546 1.521-.523-.55-1.258-.896-2.078-.896-.288 0-.56.055-.822.134-.34-.253-.736-.43-1.171-.504-.593-1.536-2.075-2.63-3.82-2.63-1.985 0-3.64 1.409-4.021 3.281-.104-.012-.206-.031-.312-.031-1.369 0-2.479 1.11-2.479 2.479 0 .365.084.709.226 1.021h27.249z"/></svg> \ No newline at end of file |