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/1f93d-200d-2640-fe0f.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/1f93d-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f93d-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f93d-200d-2640-fe0f.svg b/public/emoji/1f93d-200d-2640-fe0f.svg index 4f22a638f..1cca2e7c3 100644 --- a/public/emoji/1f93d-200d-2640-fe0f.svg +++ b/public/emoji/1f93d-200d-2640-fe0f.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="clipPath42" clipPathUnits="userSpaceOnUse"><path id="path44" d="m 28.665,33.027 c 0,-1.518 1.231,-2.749 2.75,-2.749 l 0,0 c 1.519,0 2.75,1.231 2.75,2.749 l 0,0 c 0,1.519 -1.231,2.751 -2.75,2.751 l 0,0 c -1.519,0 -2.75,-1.232 -2.75,-2.751"/></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(34.0811,34.5786)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.522,1.084 -3.531,-2.522 -3.987,-3.016 l 1.763,-1.469 -0.591,-5.579 c 0,0 -2.618,0.596 -4.297,0.579 -1.68,-0.016 -1.688,0.438 -3.242,0.438 -1.153,0 -2.226,-0.513 -2.226,-0.513 l -0.453,1.713 c 0.97,0.747 1.608,1.971 1.608,3.362 0,2.278 -1.699,4.125 -3.792,4.125 -2.094,0 -3.787,-1.856 -3.583,-4.125 0.167,-1.861 1.017,-3.351 2.405,-3.893 l -0.167,-1.441 c -0.486,0.043 -2.154,0.302 -3.21,-0.009 -2.334,-0.689 -5.404,-2.711 -6.08,-2.81 -0.473,-0.07 -2.608,-0.675 -4.14,-0.901 -0.277,-0.041 -0.891,0.966 -1.415,1.033 -0.15,0.02 -0.686,-0.691 -0.836,-0.672 -0.559,0.069 -1.078,0.115 -1.306,0.022 -0.926,-0.381 -0.4,-3.381 0.726,-3.214 0,0 2.036,0.483 2.793,0.574 1.669,0.2 4.343,0.273 5.318,0.536 1.415,0.382 4.34,1.45 4.34,1.45 -0.139,-0.467 2.478,-4.3 2.978,-10.632 0,0 3.693,-0.012 5.469,-0.012 0,0 0.036,4.343 0.438,6.469 0.254,1.349 1.187,1.438 1.187,1.438 0.538,1.309 0.395,3.179 0.406,3.531 0,0 7.943,-0.453 8.938,0.312 1.012,0.778 0.522,8.461 0.437,8.233 C 0.044,-3.954 1.294,-0.922 0,0"/></g><g transform="translate(21.7969,25.1563)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.206,-0.63 -0.344,-0.903 -0.478,-1.251 -0.243,-0.625 -0.975,-2.202 -3.038,-2.312 -1.806,-0.095 -2.33,0.676 -2.129,1.878 0.1,0.601 0.194,0.792 0.489,1.373 0,0 -0.438,0.062 -1.094,0.046 0,0 -1.511,-2.156 -2.109,-5.39 -0.341,-1.84 1.343,-3.188 1.875,-6.532 0.35,-2.203 8.156,-0.718 8.156,-0.718 0,0 -0.656,3.812 0.312,5.781 C 0.925,-5.904 0.46,-2.567 1.035,0.288 L 0,0 Z"/></g><g transform="translate(17.7906,33.1443)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.875,0.187 3.306,-0.636 3.625,-2.512 0.499,-2.935 -0.802,-4.155 -1.971,-4.592 -1.06,-0.396 -2.553,0.555 -2.488,0.548 0,0 0.992,-1.387 2.74,-0.85 1.387,0.426 1.86,1.792 2.218,1.959 0.464,0.217 0.87,0.458 1.032,0.728 0.313,0.532 0.406,1.281 0.25,1.969 C 5.344,-2.476 5.083,-2.212 5.075,-1.942 5.014,0.142 3.413,1.625 1.051,1.437 -0.611,1.306 -1.625,0.374 -2.16,-0.961 -1.981,-0.86 -1.322,-0.132 0,0"/></g><path id="path32" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,12 8.686,0 c 2.715,0 4.022,1.106 5.473,1.235 C 15.61,13.364 16.958,12 17.737,12 c 0.78,0 1.091,0.509 1.661,0.509 0.294,0 0.917,-0.509 1.592,-0.509 0.675,0 2.385,1.235 3.074,1.235 C 25.46,13.235 27.64,12 29.075,12 L 36,12 36,0 0,0 Z"/><g transform="translate(34.1653,33.0275)" id="g34"><path id="path36" style="fill:#ffd03f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.519 -1.231,-2.75 -2.75,-2.75 -1.519,0 -2.75,1.231 -2.75,2.75 0,1.519 1.231,2.75 2.75,2.75 C -1.231,2.75 0,1.519 0,0"/></g></g></g><g id="g38"><g clip-path="url(#clipPath42)" id="g40"><g transform="translate(34.0746,34.5412)" id="g46"><path id="path48" style="fill:#ffad1f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.013,0.003 -0.896,0.213 -1.651,-0.253 -10e-4,0 -0.003,0 -0.004,-0.001 -0.003,-0.002 -0.005,-0.004 -0.008,-0.006 -0.328,-0.206 -0.631,-0.541 -0.827,-1.078 -0.366,0.008 -0.698,0.044 -0.991,0.109 0.81,2.334 2.812,1.772 2.898,1.746 0.08,-0.024 0.166,0.022 0.19,0.103 0.024,0.08 -0.022,0.165 -0.102,0.19 -0.025,0.007 -2.379,0.68 -3.282,-1.959 -0.274,0.089 -0.507,0.207 -0.692,0.354 0.008,0.011 0.015,0.023 0.019,0.037 0.587,1.779 2.305,1.959 2.378,1.966 0.083,0.008 0.145,0.083 0.138,0.166 C -1.942,1.458 -2.018,1.52 -2.1,1.513 -2.12,1.511 -4.023,1.316 -4.705,-0.566 -4.985,-0.219 -4.98,0.116 -4.98,0.133 -4.977,0.216 -5.042,0.287 -5.126,0.291 -5.21,0.293 -5.281,0.229 -5.285,0.145 c -10e-4,-0.022 -0.018,-0.537 0.438,-1.013 0.484,-0.505 1.298,-0.765 2.415,-0.777 0.098,-0.341 0.148,-0.655 0.163,-0.94 -2.881,-0.103 -3.471,1.875 -3.495,1.962 -0.022,0.081 -0.106,0.129 -0.188,0.106 -0.081,-0.022 -0.129,-0.106 -0.107,-0.187 0.007,-0.023 0.636,-2.191 3.583,-2.191 0.068,0 0.139,0.002 0.209,0.005 -0.01,-0.295 -0.058,-0.555 -0.124,-0.779 -2.71,0.073 -3.242,1.656 -3.264,1.725 -0.025,0.081 -0.11,0.129 -0.191,0.104 -0.08,-0.025 -0.126,-0.106 -0.101,-0.186 0.023,-0.076 0.593,-1.869 3.453,-1.929 -0.201,-0.484 -0.466,-0.739 -0.489,-0.76 -0.062,-0.057 -0.065,-0.154 -0.008,-0.216 0.03,-0.032 0.071,-0.049 0.112,-0.049 0.037,0 0.074,0.014 0.104,0.041 0.053,0.049 1.288,1.221 0.619,3.444 -10e-4,0.004 -0.019,0.06 -0.03,0.094 0.139,0.361 0.333,0.613 0.548,0.786 1.045,-2.125 -0.356,-4.083 -0.371,-4.103 -0.05,-0.068 -0.035,-0.163 0.033,-0.213 0.027,-0.02 0.059,-0.03 0.09,-0.03 0.047,0 0.093,0.022 0.123,0.063 0.016,0.021 1.541,2.145 0.383,4.451 0.214,0.111 0.435,0.164 0.633,0.185 0.001,-0.002 0.001,-0.005 0.002,-0.007 1.162,-1.81 -0.637,-4.425 -0.655,-4.451 -0.048,-0.07 -0.031,-0.165 0.038,-0.213 0.026,-0.019 0.057,-0.028 0.087,-0.028 0.048,0 0.096,0.023 0.125,0.065 0.02,0.029 0.489,0.704 0.811,1.629 0.407,1.17 0.386,2.207 -0.06,3.014 0.183,-0.01 0.307,-0.039 0.325,-0.044 0.082,-0.019 0.165,0.03 0.185,0.112 C 0.131,-0.103 0.082,-0.021 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M34.081 1.421C32.559.337 30.55 3.943 30.094 4.437l1.764 1.469-.592 5.579s-2.617-.596-4.297-.579-1.688-.438-3.242-.438c-1.152 0-2.226.513-2.226.513l-.453-1.713c.97-.747 1.608-1.972 1.608-3.363 0-2.278-1.699-4.125-3.793-4.125-2.094 0-3.786 1.856-3.582 4.125.167 1.861 1.017 3.351 2.405 3.893l-.167 1.441c-.486-.042-2.154-.302-3.21.009-2.333.688-5.404 2.711-6.08 2.81-.474.07-2.608.675-4.14.901-.277.041-.891-.966-1.416-1.033-.15-.019-.686.691-.835.672-.56-.069-1.079-.115-1.307-.022-.926.381-.4 3.381.727 3.213 0 0 2.036-.483 2.793-.574 1.669-.2 4.343-.272 5.317-.536 1.416-.382 4.34-1.451 4.34-1.451-.139.467 2.479 4.3 2.979 10.632 0 0 3.692.012 5.469.012 0 0 .036-4.343.438-6.469.255-1.349 1.188-1.438 1.188-1.438.538-1.309.395-3.18.406-3.531 0 0 7.942.453 8.938-.312 1.012-.777.522-8.46.438-8.232.561-.515 1.811-3.546.517-4.469z"/><path fill="#DD2E44" d="M21.797 10.844c-.206.63-.344.903-.478 1.251-.242.625-.975 2.202-3.037 2.312-1.806.096-2.331-.675-2.13-1.877.101-.601.194-.792.489-1.373 0 0-.438-.062-1.094-.047 0 0-1.511 2.156-2.109 5.391-.34 1.84 1.344 3.188 1.875 6.531.35 2.203 8.156.719 8.156.719s-.656-3.812.312-5.781c-1.06-1.221-1.525-4.558-.949-7.413l-1.035.287zm-4.006-7.988c1.875-.188 3.306.636 3.625 2.512.499 2.935-.802 4.155-1.971 4.592-1.06.396-2.553-.555-2.488-.547 0 0 .991 1.387 2.74.85 1.387-.426 1.859-1.793 2.218-1.96.464-.216.87-.458 1.032-.728.312-.531.406-1.281.25-1.969-.062-.274-.323-.538-.331-.808-.062-2.083-1.662-3.567-4.024-3.379-1.662.132-2.676 1.064-3.21 2.398.178-.101.836-.829 2.159-.961z"/><path fill="#55ACEE" d="M0 36V24h8.686c2.716 0 4.023-1.106 5.474-1.235C15.61 22.636 16.958 24 17.737 24c.78 0 1.09-.509 1.66-.509.295 0 .918.509 1.593.509s2.385-1.235 3.074-1.235c1.395 0 3.575 1.235 5.011 1.235H36v12H0z"/><circle fill="#FFD03F" cx="31.415" cy="2.972" r="2.75"/><path fill="#FFAD1F" d="M33.677 1.413c-.329-.014-.811.026-1.254.299l-.004.001c-.003.002-.005.005-.008.006-.328.206-.631.541-.827 1.078-.366-.007-.698-.044-.991-.109C31.225.868 32.577.81 33.185.885c-.14-.119-.291-.222-.453-.311-.774.042-1.879.409-2.435 2.035-.274-.088-.507-.206-.693-.353.008-.012.015-.024.02-.038C30.129.687 31.467.342 31.878.271c-.151-.026-.305-.047-.463-.047-.161 0-.317.021-.471.047-.569.281-1.229.799-1.575 1.755-.174-.215-.233-.416-.256-.549-.076.116-.141.239-.198.366.065.154.153.319.313.486.484.505 1.298.765 2.415.777.098.341.148.655.163.94-1.782.064-2.684-.668-3.121-1.257-.004.062-.019.122-.019.185 0 .096.019.188.028.281.525.549 1.419 1.1 2.905 1.1.068 0 .139-.003.209-.005-.011.295-.058.554-.125.778-1.464-.039-2.28-.518-2.735-.962.134.276.305.532.519.747.507.27 1.178.482 2.114.502-.048.116-.101.217-.152.307.122-.001.239-.02.357-.036.28-.573.51-1.479.132-2.732l-.03-.094c.139-.361.333-.613.549-.786.682 1.388.321 2.7-.016 3.452.145-.057.282-.129.414-.209.307-.84.521-2.095-.141-3.411.214-.111.435-.164.633-.185.001.002.001.005.003.007.655 1.021.369 2.297-.009 3.221.233-.225.421-.492.564-.787.221-.937.163-1.777-.209-2.45.073.004.129.012.18.019-.055-.109-.11-.218-.179-.318z"/></svg> \ No newline at end of file |