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/1f3a0.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/1f3a0.svg')
-rw-r--r-- | public/emoji/1f3a0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3a0.svg b/public/emoji/1f3a0.svg index fd3e3464f..35c75b697 100644 --- a/public/emoji/1f3a0.svg +++ b/public/emoji/1f3a0.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(0,4)" id="g20"><path id="path22" style="fill:#88c9f9;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,28 c 0,2.209 -1.791,4 -4,4 L 4,32 C 1.791,32 0,30.209 0,28 L 0,0 Z"/></g><path id="path24" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,2 2,0 0,32 -2,0 0,-32 z"/><g transform="translate(24,21)" id="g26"><path id="path28" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,3 4,3 6,3 7,2 7,0 7,-2 5,-4 6,-6 6,-6 4,-3 5,-1 6.413,1.829 1,2 2,-1 3.14,-4.421 0,0 0,0"/></g><g transform="translate(28,10)" id="g30"><path id="path32" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2 1,-3 3,-3 2,0 1,0 0,2 C 2,1 0,2 0,2 L 0,0 Z"/></g><g transform="translate(6,13)" id="g34"><path id="path36" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2 2,-4 3,-4 1,0 1,1 0,2 C 2,-1 0,1 2,1 4,1 5,1 6,2 7,3 7,5 5,4 3,3 2,2 1,2 0,2 0,0 0,0"/></g><g transform="translate(16,22)" id="g38"><path id="path40" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,0 -3,0 -4,4 -0.767,3.068 -4,4 -7,3 0,0 -2,1 -1,0 1,-1 0,-1 0,-3 0,-2 0,-5 1,-5 2,0 2,3 2,3 0,0 1,0 1,-2 0,-1 -1,-2 1,-5 0,0 -3,0 -4,-1 -1,-1 -1,-3 -1,-4 0,-1 1,-3 2,-3 1,0 1,1 1,2 0,1 -2,0 -1,2 1,2 1,1 2,1 1,0 3,1 4,1 1,0 3,-1 5,-1 2,0 4,2 6,0 2,-2 5,-2 6,-3 1,-1 1,-2 1,-3 0,-1 2,-2 3,-2 1,0 1,1 0,2 -1,1 -2,0 -2,2 0,2 -1,3 -2,3 -1,0 -1,4 -1,5 0,1 -2,5 -5,5 C 4,1 2,0 0,0"/></g><g transform="translate(12.542,24.2207)" id="g42"><path id="path44" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.848,-2.216 1.815,-2.221 3.458,-2.221 1.685,0 3.378,0.704 5.662,0.928 0.12,-0.304 0.232,-0.614 0.338,-0.928 1,-3 0,-5 -5,-5 -2.762,0 -5,2.239 -5,5 0,0.802 0.206,1.55 0.542,2.221"/></g><g transform="translate(9.002,17)" id="g46"><path id="path48" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.19,0 0.383,0.054 0.553,0.168 0.687,0.257 3.851,2.396 4.946,5.684 5.121,6.208 4.838,6.774 4.314,6.949 3.786,7.125 3.225,6.84 3.05,6.316 2.174,3.689 -0.531,1.85 -0.558,1.831 -1.016,1.523 -1.139,0.903 -0.832,0.444 -0.64,0.156 -0.323,0 0,0"/></g><g transform="translate(5,29)" id="g50"><path id="path52" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2,2 4.419,1.581 6,0 8,-2 7,-4 9,-6 10.581,-7.581 7,-6 6,-3 5.293,-0.879 2,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M24.357 16.337s2.248-3.959 4.805-4.169c2.557-.21 3.929.934 4.144 3.432.287 3.334-.878 3.802-.033 7.53 0 0-3.546-2.414-2.421-6.07 1.172-3.806-4.81-3.095-3.835.316l-2.66-1.039z"/><path fill="#FFCC4D" d="M14.31 20.375c-.553 0-1 .448-1 1v13.563c0 .552.447 1 1 1s1-.448 1-1V21.375c0-.552-.448-1-1-1z"/><path fill="#F4900C" d="M15.31 25.77l-2 1.047v2.257l2-1.047zm-2 8.054l2-1.047V30.52l-2 1.047z"/><path fill="#8899A6" d="M3.912 21.935c-1.181-.117-1.918 1.621-1.918 1.621.114.814.447 2.255.597 2.778.327 1.141 2.121 3.095 3.262 2.768 1.141-.327.814-1.468.487-2.608-.327-1.141-2.428.622-1.794-1.955.149-.606.865-.756 1.483-.695 2.362.234 2.881-.223 3.788-1.325 1.064-1.296-4.724-.467-5.905-.584zm25.142 6.7c0 2.373 1.187 3.56 3.56 3.56s1.187 0 0-2.373-3.56-3.56-3.56-3.56v2.373z"/><path fill="#CCD6DD" d="M34.987 31.008c-1.187-1.187-2.373 0-2.373-2.373s-1.187-3.56-2.373-3.56-1.187-4.746-1.187-5.933-2.373-5.933-5.933-5.933c-3.56 0-5.933 1.187-8.306 1.187-2.373 0-3.56 0-4.746-4.746-.91-3.64-4.746-4.746-8.306-3.56 0 0-2.582-.995-1.395.192 1.187 1.187-.18.995-.18 3.368 0 .275.066.515.174.73C.354 11.489.343 13.521.369 14c.036.667.294.883 1.131 1.208 1.125.438 1.782-.319 1.854-.708.146-.792.021-1.656.021-1.656s1.167-.469 1.896-1.135c.098.081.625 1.146.052 2.688-.413 1.112-1.187 2.373 1.187 5.933 0 0-3.56 0-4.746 1.187C.577 22.704.288 25.077.312 26.263c.033 1.648 1.452 3.56 2.639 3.56s1.187-1.187 1.187-2.373c0-1.187-2.373 0-1.187-2.373 1.187-2.373 1.187-1.187 2.373-1.187 1.187 0 3.56-1.187 4.746-1.187s3.56 1.187 5.933 1.187c2.373 0 4.746-2.373 7.119 0 2.373 2.373 5.933 2.373 7.119 3.56 1.187 1.187 1.187 2.373 1.187 3.56 0 1.187 2.373 2.373 3.56 2.373s1.186-1.188-.001-2.375z"/><path fill="#3B94D9" d="M10.712 11.761c1.006 2.629 2.154 2.635 4.103 2.635 2 0 4.008-.835 6.718-1.101.143.36.276.728.401 1.101 1.187 3.56 0 5.933-5.933 5.933-3.277 0-5.933-2.656-5.933-5.933.001-.951.246-1.838.644-2.635z"/><path fill="#F4900C" d="M5.629 19.705c.225.026.459-.013.674-.124.17-.087 4.187-2.185 5.919-5.914.276-.594-1.171-1.719-1.446-1.629-.301.099-.56.318-.704.628-1.385 2.98-4.821 4.786-4.854 4.804-.581.301-.81 1.017-.509 1.598.187.367.539.594.92.637z"/><ellipse fill="#1C6399" cx="14.31" cy="15.245" rx="1.455" ry="1.163"/><path fill="#FFCC4D" d="M14.31.25c-.553 0-1 .448-1 1v13.573l.005-.001-.003.001c.006.547.449.989.998.989.553 0 1-.448 1-1V1.25c0-.552-.448-1-1-1z"/><path fill="#F4900C" d="M15.31 2.02l-2 1.047v2.257l2-1.047zm0 4.75l-2 1.047v2.257l2-1.047zm-2 8.043l.01.006 1.99-1.041V11.52l-2 1.047v2.246z"/><path fill="#1C6399" d="M3.274 13.255c-.091 0-.182-.025-.262-.074-1.136-.698-2.341-.72-2.353-.72-.276-.003-.498-.229-.496-.504.002-.275.225-.496.5-.496.057.011 1.129.003 2.35.584.287-.838.765-2.666.466-4.922-.036-.274.156-.525.43-.562.276-.033.525.156.562.43.452 3.409-.695 5.875-.744 5.978-.061.128-.173.225-.31.265-.047.014-.095.021-.143.021z"/><ellipse transform="rotate(-56.453 1.847 8.862)" fill="#292F33" cx="1.846" cy="8.862" rx=".555" ry=".424"/><path fill="#DD2E44" d="M12.442 13.21c-2.373-2.373-1.006-5.256-3.379-7.629-1.876-1.876-4.927-1.863-7.3.51 0 0 1.121 1.086 4.081 1.378 1.43.141 2.649 1.693 3.337 2.782 2.21 4.311 5.056 4.754 3.261 2.959z"/></svg> \ No newline at end of file |