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/1f1f5-1f1ec.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/1f1f5-1f1ec.svg')
-rw-r--r-- | public/emoji/1f1f5-1f1ec.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f5-1f1ec.svg b/public/emoji/1f1f5-1f1ec.svg index a39a0e987..2d20ed8e7 100644 --- a/public/emoji/1f1f5-1f1ec.svg +++ b/public/emoji/1f1f5-1f1ec.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(36,9)" id="g20"><path id="path22" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(34.6182,5.998)" id="g24"><path id="path26" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.84,0.733 1.382,1.8 1.382,3.002 l 0,18 c 0,2.209 -1.791,4 -4,4 l -28,0 c -1.007,0 -1.915,-0.384 -2.618,-0.998 L 0,0 Z"/></g><g transform="translate(7.7207,22.4639)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.383,-1.316 1.324,0 L 0.662,-2.12 1.045,-3.398 0,-2.594 l -1.045,-0.768 0.383,1.242 -1.045,0.804 1.289,0 L 0,0 Z"/></g><g transform="translate(3.707,17.3315)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.383,-1.315 1.324,0 L 0.662,-2.119 1.045,-3.398 0,-2.594 l -1.045,-0.768 0.383,1.243 -1.045,0.804 1.289,0 L 0,0 Z"/></g><g transform="translate(7.7207,10.3984)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.383,-1.315 1.324,0 L 0.662,-2.119 1.045,-3.398 0,-2.595 l -1.045,-0.766 0.383,1.242 -1.045,0.804 1.289,0 L 0,0 Z"/></g><g transform="translate(9.5132,13.1924)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.191,-0.657 0.663,0 L 0.331,-1.061 0.522,-1.699 0,-1.297 l -0.522,-0.384 0.191,0.62 -0.523,0.404 0.645,0 L 0,0 Z"/></g><g transform="translate(11.7158,17.6963)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.383,-1.315 1.324,0 L 0.662,-2.119 1.045,-3.398 0,-2.595 l -1.045,-0.766 0.383,1.242 -1.044,0.804 1.288,0 L 0,0 Z"/></g><g transform="translate(28.0664,20.6953)" id="g48"><path id="path50" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.437,-0.437 3.391,-2.407 3.391,-4.814 3.391,-7.222 1.238,-7.148 0.619,-7.075 1.312,-7.659 3.938,-7.55 3.938,-4.814 3.938,-2.407 0.547,0 0.109,0.219 -0.328,0.437 -0.439,0.437 0,0 m -5.344,2.571 c -0.308,-0.4 -1.039,0.401 -1.914,0.419 -0.875,0.018 -1.496,-0.839 -1.75,-1.131 -0.256,-0.292 -1.077,-1.823 -1.058,-1.987 0.019,-0.164 0.511,0.456 0.693,0.565 0.018,-0.218 -0.201,-0.474 -0.147,-0.546 0.055,-0.074 0.639,0.437 0.84,0.455 0.055,-0.146 -0.109,-0.291 -0.054,-0.51 0.072,-0.074 0.4,0.364 0.619,0.455 0.037,-0.164 -0.201,-0.474 -0.073,-0.674 0.09,-0.019 0.639,0.619 0.821,0.693 0.181,0.073 -0.092,-0.602 0,-0.657 0.164,0.109 0.674,0.693 0.838,0.766 0.164,0.073 -0.018,-0.747 0.054,-0.747 0.202,0.145 0.711,0.838 0.766,0.947 0.055,0.11 -0.055,-1.056 0.512,-1.677 0.566,-0.62 1.422,-1.331 1.513,-1.331 0.11,0.201 -0.037,0.62 0.055,0.602 0.256,-0.274 0.729,-0.675 0.838,-0.675 0.109,0 -0.072,0.438 0.074,0.438 0.291,-0.274 1.129,-1.35 2.772,-1.842 -0.11,0.31 -0.348,0.584 -0.366,0.729 0.11,-0.017 0.493,-0.2 0.565,-0.182 0.074,0.018 -0.801,1.094 -0.748,1.24 0.201,0.018 0.293,-0.109 0.365,-0.018 -0.09,0.146 -0.857,1.003 -0.857,1.203 0,0.201 0.238,-0.036 0.31,0 0.074,0.037 -0.291,0.802 -0.219,0.894 0.073,0.09 0.875,-0.492 1.077,-0.492 0.201,0 0.054,0.711 0.146,0.747 0.09,0.036 0.766,-0.383 0.91,-0.383 0.147,0 0.129,0.31 0.184,0.274 0.055,-0.037 1.641,-1.623 1.094,-3.483 -0.547,-1.331 -1.641,-2.042 -3.246,-1.459 0.091,-0.145 0.949,-0.856 1.878,-0.601 0.93,0.254 2.061,0.984 1.934,2.807 -0.129,1.824 -0.73,2.079 -0.82,2.352 C 2.168,0.036 2.406,-0.311 2.605,-0.383 2.809,-0.456 2.57,0 2.516,0.2 2.461,0.4 3.117,-0.219 3.281,-0.273 3.445,-0.328 2.898,1.222 2.734,1.331 2.57,1.44 2.898,1.294 3.008,1.258 3.117,1.222 2.004,2.954 1.768,2.954 c -0.237,0 0.201,0.09 0.328,0.09 0.127,0 -1.276,1.131 -1.514,1.131 -0.236,0 0.512,0.292 0.584,0.31 0.127,-0.018 -1.623,0.93 -3.191,-0.018 -0.09,0.073 0.738,0.647 0.765,0.893 0.01,0.064 -0.273,0.201 -0.291,0.274 -0.017,0.073 0.438,0.292 0.455,0.456 -0.109,0.146 -0.308,0.091 -0.418,0.127 -0.027,0.137 0.383,0.474 0.346,0.62 -0.027,0.082 -0.328,0.11 -0.4,0.055 -0.075,-0.055 0.191,0.383 0.144,0.51 -0.035,0.055 -0.181,0.018 -0.328,-0.018 -0.09,0.018 0.475,0.803 0.365,0.912 C -1.496,8.405 -3.027,7.494 -3.592,6.473 -4.158,5.451 -3.721,4.631 -3.793,4.284 -3.865,3.939 -3.957,3.591 -4.193,3.591 -4.432,3.591 -4.979,3.956 -5.16,4.139 -5.344,4.321 -5.379,4.448 -5.635,4.521 -5.891,4.595 -6.475,4.376 -6.693,4.357 -6.912,4.339 -7.768,4.521 -7.822,4.467 -7.877,4.412 -6.984,4.084 -6.783,3.974 -6.584,3.865 -6.564,3.72 -6.42,3.628 -6.273,3.537 -4.904,3.136 -5.344,2.571"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#141414" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#CE1126" d="M34.618 30.002C35.458 29.269 36 28.202 36 27V9c0-2.209-1.791-4-4-4H4c-1.006 0-1.915.384-2.618.998l33.236 24.004z"/><path d="M7.721 13.536l.383 1.316h1.324l-1.045.804.383 1.279-1.045-.805-1.045.768.383-1.242-1.045-.804h1.289zm-4.014 5.133l.383 1.314h1.324l-1.045.804.383 1.279-1.045-.803-1.045.767.383-1.243L2 19.983h1.289zm4.014 6.933l.383 1.315h1.324l-1.045.804L8.766 29l-1.045-.804-1.045.767.383-1.242-1.045-.804h1.289zm1.792-2.794l.192.657h.662l-.523.403.192.639-.523-.403-.522.384.191-.62-.522-.403h.644zm2.203-4.504l.383 1.315h1.324l-1.045.804.383 1.279-1.045-.804-1.045.767.383-1.242-1.045-.804h1.289z" fill="#FFF"/><path fill="#FCD116" d="M22.723 12.734c-.309.399-1.039-.401-1.914-.419-.875-.019-1.496.838-1.75 1.13-.256.292-1.077 1.823-1.059 1.988.02.164.512-.457.693-.566.017.219-.201.475-.146.547.055.074.639-.438.84-.455.055.146-.109.291-.055.51.072.074.4-.364.619-.455.037.164-.201.474-.072.674.09.019.639-.619.82-.692.182-.073-.092.602 0 .657.164-.109.674-.693.838-.766.164-.073-.018.747.055.747.201-.145.711-.838.766-.947.055-.109-.055 1.057.512 1.677.566.62 1.422 1.331 1.514 1.331.109-.2-.037-.62.055-.602.256.273.729.675.838.675s-.072-.438.074-.438c.291.273 1.129 1.35 2.771 1.842-.109-.311-.348-.584-.365-.729.109.018.492.2.564.183.074-.019-.801-1.095-.748-1.24.201-.019.293.109.365.018-.09-.146-.857-1.003-.857-1.203 0-.201.238.036.311 0 .074-.037-.291-.802-.219-.894.072-.09.875.492 1.076.492.201 0 .055-.711.147-.747.09-.036.766.383.91.383.146 0 .129-.31.184-.274.055.036 1.641 1.623 1.094 3.482-.547 1.331-1.641 2.042-3.246 1.459.092.146.949.856 1.879.602.93-.255 2.061-.984 1.934-2.808-.129-1.824-.73-2.079-.82-2.352-.094-.273.145.073.344.145.203.074-.035-.383-.09-.583-.055-.2.602.419.766.474.164.055-.383-1.495-.547-1.604-.164-.109.164.037.273.073.109.036-1.004-1.696-1.24-1.696s.201-.091.328-.091-1.275-1.13-1.514-1.13c-.236 0 .512-.292.584-.311.127.019-1.623-.93-3.191.019-.09-.073.738-.648.766-.894.01-.063-.273-.2-.291-.273-.018-.073.438-.292.455-.456-.109-.146-.309-.091-.418-.127-.027-.137.383-.475.346-.621-.027-.082-.328-.109-.4-.055-.074.055.192-.383.145-.51-.035-.055-.182-.018-.328.018-.09-.018.475-.802.365-.912-.109-.109-1.641.802-2.205 1.823-.566 1.021-.129 1.842-.201 2.188-.072.346-.164.693-.4.693-.238 0-.785-.365-.967-.547-.184-.183-.219-.31-.475-.383-.256-.073-.84.146-1.059.164-.219.019-1.074-.164-1.129-.109-.055.055.838.383 1.039.493.199.109.219.254.363.346.143.09 1.512.491 1.073 1.056zm5.343 2.571c.438.438 3.391 2.407 3.391 4.814s-2.152 2.334-2.772 2.261c.693.584 3.318.475 3.318-2.261 0-2.407-3.391-4.814-3.828-5.033-.437-.219-.548-.219-.109.219z"/></svg> \ No newline at end of file |