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/1f469-1f3fe-200d-1f3a4.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/1f469-1f3fe-200d-1f3a4.svg')
-rw-r--r-- | public/emoji/1f469-1f3fe-200d-1f3a4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3fe-200d-1f3a4.svg b/public/emoji/1f469-1f3fe-200d-1f3a4.svg index f1d48b1d8..de1f4f084 100644 --- a/public/emoji/1f469-1f3fe-200d-1f3a4.svg +++ b/public/emoji/1f469-1f3fe-200d-1f3a4.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 16.125,10 C 12.812,10 9,7.815 9,4.5 L 9,4.5 9,0 35,0 35,4.5 C 35,7.815 31.44,10 28.125,10 l 0,0 -12,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" 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(35,0)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,4.5 C 0,7.814 -3.561,10 -6.875,10 l -12,0 C -22.188,10 -26,7.814 -26,4.5 L -26,0 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(15.5005,10.5)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5 6.499,-9 6.499,-9 0,0 6.5,4.5 6.5,9 0,3.5 7.5,0 7.5,0 0,0 -6,6.5 -6,0 0,-6.5 1,-10.5 1,-10.5 l -17.999,0 c 0,0 1,4.5 1,10.5 0,0 1.5,4 1.5,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(21.9453,32.0215)" id="g44"><path id="path46" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.947,-2.053 10.947,-10.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.79,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.895,-2.052 -2.288,0 -2.054,8.21 -2.054,10.948 C -10.949,-2.053 -4.105,0 0,0"/></g><g transform="translate(18.5,9.4824)" id="g48"><path id="path50" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.792,-0.98 3.5,-0.98 0.708,0 2.194,-0.085 3.488,0.949 L 7,4.108 0,4.108 0,0 Z"/></g><g transform="translate(18.5,11.8445)" id="g52"><path id="path54" style="fill:#9b6a49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.975,-1.102 2.185,-1.4 3.499,-1.4 4.814,-1.4 6.025,-1.102 7,0 l 0,2.801 -7,0 L 0,0 Z"/></g><g transform="translate(13.7339,21.373)" id="g56"><path id="path58" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.564 8.211,10.564 4.534,0 8.209,-4.73 8.209,-10.564 0,-5.833 -3.675,-10.285 -8.209,-10.285 C 3.676,-10.285 0,-5.833 0,0"/></g><g transform="translate(21.9453,13.5479)" id="g60"><path id="path62" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(11.7251,18.0908)" id="g64"><path id="path66" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.737,4.051 0.684,0.685 2.052,2.026 2.052,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.719,0 c 0.006,2 0.006,1.924 0.006,3.202 0,8.895 -6.842,12.207 -10.949,12.207 C 6.115,15.409 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(18.6084,19.2041)" id="g68"><path id="path70" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(25.373,19.2041)" id="g72"><path id="path74" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.8359,16.5908)" id="g76"><path id="path78" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(23.5,6)" id="g80"><path id="path82" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(25.5,7)" id="g84"><path id="path86" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(20.5,7)" id="g88"><path id="path90" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(26.5,8.25)" id="g92"><path id="path94" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 0,0.414 0.336,0.75 0.75,0.75 C -0.336,0.75 0,0.414 0,0"/></g><g transform="translate(19,8.25)" id="g96"><path id="path98" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 0,0.414 0.336,0.75 0.75,0.75 C -0.336,0.75 0,0.414 0,0"/></g><g transform="translate(17.9995,9.5)" id="g100"><path id="path102" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.276,0 -0.499,0.224 -0.499,0.5 0,0.276 0.223,0.5 0.499,0.5 C -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(27,9.5)" id="g104"><path id="path106" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(15.4443,21.1553)" id="g108"><path id="path110" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,21.1553)" id="g112"><path id="path114" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(15,14.5928)" id="g116"><path id="path118" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.901 -1.541,-3.442 -3.442,-3.442 -1.901,0 -3.442,1.541 -3.442,3.442 0,1.901 1.541,3.442 3.442,3.442 C -1.541,3.442 0,1.901 0,0"/></g><g transform="translate(13.4053,11.2676)" id="g120"><path id="path122" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.168,-0.168 -0.441,-0.168 -0.608,0 l -4.564,4.564 c -0.168,0.168 -0.168,0.44 0,0.608 l 0.608,0.609 c 0.168,0.168 0.441,0.168 0.609,0 L 0.608,1.217 c 0.168,-0.168 0.168,-0.441 0,-0.609 L 0,0 Z"/></g><g transform="translate(1.0273,3.248)" id="g124"><path id="path126" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.69,-0.42 1.705,-0.305 2.431,0.324 l 6.861,6.269 c 0.417,0.362 0.44,0.969 0.051,1.358 l -2.162,2.164 c -0.39,0.389 -0.998,0.366 -1.36,-0.051 L -0.333,3.088 C -0.942,2.384 -1.063,1.411 -0.688,0.723"/></g><g transform="translate(2,22.7236)" id="g128"><path id="path130" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-4.062 C 0,-4.023 -0.324,-4 -0.501,-4 c -0.828,0 -1.5,-0.447 -1.5,-1 0,-0.552 0.672,-1 1.5,-1 C 0.328,-6 1,-5.552 1,-5 l 0,0 0,3.056 2,-1.112 0,-2.506 C 3,-5.523 2.926,-5.5 2.749,-5.5 c -0.828,0 -1.375,-0.447 -1.375,-1 0,-0.552 0.487,-1.042 1.313,-1.112 C 4,-7.724 4,-6.724 4,-6.724 L 4,-2.223 0,0 Z"/></g><g transform="translate(9,26)" id="g132"><path id="path134" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.838 c -0.158,0.037 -0.324,0.062 -0.5,0.062 -0.829,0 -1.5,-0.448 -1.5,-1 0,-0.552 0.671,-1 1.5,-1 0.828,0 1.5,0.448 1.5,1 L 1,0 0,0 Z"/></g><path id="path136" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 4.458,7.5 2,0 0,-7.5 -2,0 0,7.5 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M27.875 26h-12c-3.313 0-7.125 2.186-7.125 5.5V36h26v-4.5c0-3.314-3.56-5.5-6.875-5.5z"/><path fill="#AE7E57" d="M21.75 25.917l-6.188.601 6.188 8.045 5.229-8.045z"/><path fill="#A88DC1" d="M21.749 36h9.001c4-3.5 5.083-6.5 5.083-6.5S32.5 26 26.062 24.854c0 1.224.988 3.132.988 3.132l-5.301 6.576V36z"/><path fill="#7355A2" d="M33 27.406s-1.953-1.328-4.156-2.062c-3.058-1.019-2.375 1.82-2.375 1.82s-3.82 6.034-4.72 7.399c0 0 6.534-5.43 11.251-7.157z"/><path fill="#522E8D" d="M21.75 34.563s7.333-7.479 12.125-8.354c-4.083-3.417-10.125-3.042-10.125-3.042 0 1.224 1.488 1.868 1.488 3.382 0 2.485-2.59 6.203-3.489 7.567l.001.447z"/><path fill="#A88DC1" d="M21.749 36h-9.001c-4-3.5-5.083-6.5-5.083-6.5s3.333-3.5 9.771-4.646c0 1.224-.988 3.132-.988 3.132l5.301 6.576V36z"/><path fill="#7355A2" d="M10.498 27.406s1.953-1.328 4.156-2.062c3.058-1.019 2.375 1.82 2.375 1.82s3.82 6.034 4.72 7.399c0 0-6.534-5.43-11.251-7.157z"/><path fill="#522E8D" d="M21.748 34.563s-7.333-7.479-12.125-8.354c4.083-3.417 10.125-3.042 10.125-3.042 0 1.224-1.488 1.868-1.488 3.382 0 2.485 2.59 6.203 3.489 7.567l-.001.447z"/><path fill="#AE7E57" d="M18.25 26.518c1.466 1.065 2.792.98 3.5.98s2.194.085 3.488-.949l.012-4.14h-7v4.109z"/><path fill="#9A6A4A" d="M18.25 24.155c.975 1.102 2.185 1.4 3.499 1.4 1.315 0 2.526-.298 3.501-1.4v-2.801h-7v2.801z"/><path fill="#F4ABBA" d="M30.877 21.749c-.175.369-.534.739-.736.93 1.969.427 3.359.946 3.359.946s-.483-.662-.694-1.875c-.074-.422-.391-.826-.458-1.375-.079-.651-.164-1.393-.208-2.208-.052-.951-.121-1.809-.083-2.958.289-8.89-6.256-11.23-10.36-11.23S10.459 6.036 10.748 14.926c.037 1.149.019 2.206-.032 3.157-.044.815-.113 1.553-.193 2.205-.067.549-.141 1.037-.215 1.459-.212 1.213-.417 1.879-.417 1.879s6.906-2.592 11.805-.958c2.234-.745 4.881-.609 7.105-.242.347-.098 1.437-.408 2.076-.677z"/><path fill="#AE7E57" d="M21.695 4.064c-4.535 0-8.211 4.729-8.211 10.563 0 1.358.206 2.636.569 3.805.049.157.099.312.153.464.237.663.529 1.284.866 1.859.206.352.429.686.669 1 1.496 1.959 3.608 3.157 5.954 3.157 4.533 0 8.209-4.452 8.209-10.285 0-5.834-3.676-10.563-8.209-10.563z"/><path fill="#DD2E44" d="M19.766 14.133l2.581-3.69-4.362-1.775-3.933 9.764c.049.157.099.312.153.464l1.946-.798-1.08 2.657c.206.352.429.686.669 1l6.822-8.236-2.796.614z"/><path fill="#DE2032" d="M21.695 22.452c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.019.26.269.26.691-.004.955-.089.092-.929.886-2.535.886"/><path fill="#915B34" d="M22.586 19.409h-1.69c-.233 0-.423-.189-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .234-.191.423-.424.423"/><path fill="#60352A" d="M25.123 16.796c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847m-6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847"/><path fill="#F4ABBA" d="M32.681 17.022c.003-1.113.003-1.269.003-2.315 0-2.237-.434-4.12-1.147-5.686.382.076.845.139 1.244.094-.779-.556-1.912-1.586-2.354-1.994-2.36-3.27-6.077-4.621-8.691-4.621-3.754 0-9.783 2.739-10.787 10.011l-.015-.111s-.84 2.042-1.461 3.114c.475-.155.974-.495 1.316-.758-.002.732-.018 1.244.009 3.153h.72c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.438 1.368-2.683 2.736-4.051.331-.331.821-.815 1.24-1.227 1.396.632 3.268 1.109 5.734 1.228.238.069 1.847.574 3.119 1.903-.042-.857-.384-1.432-.604-1.721 1.947.399 3.147 1.725 3.406 3.971l.011.072c-.014.374-.12 1.783-.914 3.1.686-.223 1.1-.619 1.314-.881 1.205 4.775 3.932 5.732 3.932 5.732-.555-2.414-.75-4.83-.82-6.605z"/><path fill="#AE7E57" d="M15.194 14.845c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623 1.639 1.175 1.639 2.623"/><path fill="#424143" d="M10.513 20.292c-1.695 0-3.069 1.374-3.069 3.07 0 .478.119.925.314 1.328l-.232-.232c-.347-.347-.89-.327-1.212.045L.826 30.725c-.544.628-.798 1.643.011 2.452.809.809 1.807.574 2.454.013l.892-.815V36h1.784v-5.255l3.443-3.146c.372-.323.393-.865.045-1.211l-.271-.271c.404.196.851.315 1.33.315 1.696 0 3.07-1.374 3.07-3.07-.001-1.696-1.376-3.07-3.071-3.07z"/><path fill="#59595C" d="M12.161 26.327c-.15.15-.393.15-.543 0l-4.07-4.07c-.15-.15-.15-.392 0-.542l.543-.543c.15-.15.393-.15.543 0l4.07 4.07c.15.15.15.393 0 .543l-.543.542z"/></svg> \ No newline at end of file |