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/1f1f0-1f1ea.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/1f1f0-1f1ea.svg')
-rw-r--r-- | public/emoji/1f1f0-1f1ea.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f0-1f1ea.svg b/public/emoji/1f1f0-1f1ea.svg index 7448af9f4..5bee37fd7 100644 --- a/public/emoji/1f1f0-1f1ea.svg +++ b/public/emoji/1f1f0-1f1ea.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:#006600;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><path id="path24" style="fill:#bb1600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 0,13 0,23 36,23 36,13 Z"/><g transform="translate(32,31)" id="g26"><path id="path28" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 36,0 0,4 C 4,-1.791 2.209,0 0,0"/></g><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,22 -36,0 0,1 36,0 0,-1 z"/><path id="path32" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,13 -36,0 0,1 36,0 0,-1 z"/><g transform="translate(13.7798,10.6172)" id="g34"><path id="path36" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 7.28,12.234 c 0.542,-0.151 0.935,0.532 1.29,1.592 0.418,1.242 0.759,2.085 0.688,2.127 C 9.186,15.996 8.609,15.293 7.715,14.335 6.944,13.505 6.531,12.826 6.951,12.425 L -0.327,0.193 C -0.381,0.104 -0.054,-0.094 0,0"/></g><g transform="translate(13.7798,10.6172)" id="g38"><path id="path40" style="fill:none;stroke:#141414;stroke-width:0.06;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 7.28,12.234 c 0.542,-0.151 0.935,0.532 1.29,1.592 0.418,1.242 0.759,2.085 0.688,2.127 C 9.186,15.996 8.609,15.293 7.715,14.335 6.944,13.505 6.531,12.826 6.951,12.425 L -0.327,0.193 C -0.381,0.104 -0.054,-0.094 0,0 Z"/></g><g transform="translate(22.2188,10.6172)" id="g42"><path id="path44" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.279,12.234 c -0.542,-0.151 -0.935,0.532 -1.291,1.592 -0.417,1.242 -0.758,2.085 -0.687,2.127 0.07,0.043 0.649,-0.66 1.541,-1.618 0.773,-0.83 1.187,-1.509 0.767,-1.91 L 0.328,0.193 C 0.383,0.104 0.056,-0.094 0,0"/></g><g transform="translate(22.2188,10.6172)" id="g46"><path id="path48" style="fill:none;stroke:#141414;stroke-width:0.06;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 -7.279,12.234 c -0.542,-0.151 -0.935,0.532 -1.291,1.592 -0.417,1.242 -0.758,2.085 -0.687,2.127 0.07,0.043 0.649,-0.66 1.541,-1.618 0.773,-0.83 1.187,-1.509 0.767,-1.91 L 0.328,0.193 C 0.383,0.104 0.056,-0.094 0,0 Z"/></g><g transform="translate(17.9995,10.5195)" id="g50"><path id="path52" style="fill:#bb1600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.493,1.87 3.692,4.362 3.692,7.5 3.692,10.638 2.493,13.13 0,14.999 -2.492,13.13 -3.692,10.638 -3.692,7.5 -3.692,4.362 -2.492,1.87 0,0"/></g><g transform="translate(17.9995,10.5195)" id="g54"><path id="path56" style="fill:none;stroke:#141414;stroke-width:0.06;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 2.493,1.87 3.692,4.362 3.692,7.5 3.692,10.638 2.493,13.13 0,14.999 -2.492,13.13 -3.692,10.638 -3.692,7.5 -3.692,4.362 -2.492,1.87 0,0 Z"/></g><g transform="translate(15.1016,14.0459)" id="g58"><path id="path60" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.533,1.184 0.793,2.499 0.793,3.965 0.793,5.43 0.533,6.746 0,7.931 -0.532,6.746 -0.794,5.43 -0.794,3.965 -0.794,2.499 -0.532,1.184 0,0"/></g><g transform="translate(15.1016,14.0459)" id="g62"><path id="path64" style="fill:none;stroke:#141414;stroke-width:0.02;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 0.533,1.184 0.793,2.499 0.793,3.965 0.793,5.43 0.533,6.746 0,7.931 -0.532,6.746 -0.794,5.43 -0.794,3.965 -0.794,2.499 -0.532,1.184 0,0 Z"/></g><g transform="translate(20.9033,14.0459)" id="g66"><path id="path68" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.531,1.184 -0.794,2.499 -0.794,3.965 -0.794,5.43 -0.531,6.746 0,7.931 0.532,6.746 0.793,5.43 0.793,3.965 0.793,2.499 0.532,1.184 0,0"/></g><g transform="translate(20.9033,14.0459)" id="g70"><path id="path72" style="fill:none;stroke:#141414;stroke-width:0.02;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C -0.531,1.184 -0.794,2.499 -0.794,3.965 -0.794,5.43 -0.531,6.746 0,7.931 0.532,6.746 0.793,5.43 0.793,3.965 0.793,2.499 0.532,1.184 0,0 Z"/></g><g transform="translate(17.9995,17.0732)" id="g74"><path id="path76" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.306,0 0.555,0.424 0.555,0.946 0.555,1.469 0.306,1.893 0,1.893 -0.306,1.893 -0.554,1.469 -0.554,0.946 -0.554,0.424 -0.306,0 0,0"/></g><g transform="translate(17.7686,19.5703)" id="g78"><path id="path80" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.502,0.739 -0.746,1.677 -0.746,2.821 0,1.145 0.244,2.084 0.746,2.823 L 0,0 Z"/></g><g transform="translate(18.231,19.5703)" id="g82"><path id="path84" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.501,0.739 0.744,1.677 0.744,2.821 0.744,3.966 0.501,4.905 0,5.644 L 0,0 Z"/></g><g transform="translate(17.7686,16.4697)" id="g86"><path id="path88" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.502,-0.738 -0.746,-1.677 -0.746,-2.821 0,-1.146 0.244,-2.082 0.746,-2.822 L 0,0 Z"/></g><g transform="translate(18.231,16.4697)" id="g90"><path id="path92" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.501,-0.738 0.744,-1.677 0.744,-2.821 0.744,-3.967 0.501,-4.903 0,-5.643 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#060" 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="#BB1600" d="M0 13h36v10H0z"/><path fill="#141414" d="M32 5H4C1.791 5 0 6.791 0 9v4h36V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M0 13h36v1H0zm0 9h36v1H0z"/><path fill="#141414" d="M23.054 9.404c-.066-.039-.186.089-.794.764-.216.24-.486.539-.785.86-.608.653-1.244 1.461-.783 1.935l-7.265 12.211c-.011.018-.019.047.003.087.046.083.199.175.294.177h.003c.046 0 .068-.021.079-.039l7.268-12.215c.626.148 1.024-.784 1.305-1.616.14-.417.274-.796.381-1.1.302-.856.356-1.027.294-1.064z"/><path fill="#FFF" d="M22.305 10.208c-.216.24-.486.539-.786.861-.886.952-1.124 1.528-.769 1.868l.018.016-7.29 12.252c-.004.008.001.021.005.027.035.063.169.144.242.145h.002c.01 0 .023-.001.028-.01l7.279-12.234.012-.02.022.006c.458.13.846-.355 1.254-1.572.14-.417.274-.796.381-1.101.168-.475.314-.889.314-.984-.082.046-.375.372-.712.746z"/><path fill="#141414" d="M15.308 12.963c.461-.474-.174-1.282-.783-1.935-.299-.322-.569-.62-.785-.86-.608-.674-.728-.803-.794-.764-.062.038-.008.208.293 1.063.107.304.241.683.381 1.1.28.833.678 1.764 1.305 1.616l7.268 12.215c.011.018.033.039.079.039h.003c.095-.002.248-.094.294-.177.021-.04.014-.069.003-.087l-7.264-12.21z"/><path fill="#FFF" d="M15.25 12.937c.355-.34.118-.916-.769-1.868-.3-.322-.569-.621-.786-.861-.337-.374-.631-.7-.714-.745 0 .095.146.509.314.984.107.305.242.684.381 1.101.409 1.217.796 1.702 1.254 1.572l.022-.006.012.02 7.279 12.234c.005.009.019.01.028.01h.002c.073-.001.207-.081.242-.145.004-.007.009-.02.005-.027l-7.29-12.252.02-.017z"/><path fill="#141414" d="M18.018 10.458L18 10.444l-.018.014c-2.492 1.87-3.704 4.331-3.704 7.523s1.211 5.653 3.704 7.524l.018.013.018-.013c2.492-1.87 3.704-4.331 3.704-7.524s-1.212-5.655-3.704-7.523z"/><path fill="#BB1600" d="M20.879 14.059c-.603-1.363-1.551-2.54-2.88-3.54-1.326.999-2.273 2.174-2.877 3.533.525 1.181.782 2.468.782 3.937 0 1.467-.256 2.751-.779 3.928.604 1.356 1.55 2.529 2.873 3.527 1.326-.999 2.273-2.174 2.876-3.534-.521-1.178-.776-2.461-.776-3.921.002-1.462.258-2.747.781-3.93z"/><path d="M18 18.927c.306 0 .555-.424.555-.946s-.249-.947-.555-.947c-.306 0-.554.424-.554.947-.001.522.248.946.554.946zm-.231-2.497c-.502-.739-.746-1.677-.746-2.821 0-1.145.244-2.083.746-2.823v5.644zm.462 0c.501-.739.744-1.677.744-2.821 0-1.145-.243-2.083-.744-2.823v5.644zm-.462 3.1c-.502.738-.746 1.677-.746 2.821 0 1.146.244 2.082.746 2.822V19.53zm.462 0c.501.738.744 1.677.744 2.821 0 1.146-.243 2.082-.744 2.822V19.53z" fill="#FFF"/></svg> \ No newline at end of file |