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/1f1f2-1f1ff.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/1f1f2-1f1ff.svg')
-rw-r--r-- | public/emoji/1f1f2-1f1ff.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f2-1f1ff.svg b/public/emoji/1f1f2-1f1ff.svg index ddca4a7bd..cfa95772e 100644 --- a/public/emoji/1f1f2-1f1ff.svg +++ b/public/emoji/1f1f2-1f1ff.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:#fce100;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:#141414;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:#007168;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(1.313,6.0547)" id="g34"><path id="path36" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 15.719,11.881 0.017,23.904 c -0.811,-0.732 -1.33,-1.78 -1.33,-2.959 l 0,-18 C -1.313,1.774 -0.801,0.731 0,0"/></g><g transform="translate(9.478,12.9385)" id="g38"><path id="path40" style="fill:#fce100;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.271,2.395 -6.537,0 -5.27,3.851 -8.558,6.216 -4.504,6.202 -3.27,10.059 -2.03,6.199 2.02,6.217 -1.269,3.847 0,0 Z"/></g><g transform="translate(3.3687,15.2979)" id="g42"><path id="path44" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.356,0 C 2.546,-0.213 2.969,-0.3 3.372,0.002 4.11,0.406 5.539,0 5.539,0 L 5.82,0.299 5.135,2.549 4.889,2.813 c 0,0 -0.529,0.317 -1.531,0.211 C 2.356,2.918 2.005,3.06 2.005,3.06 2.005,3.06 1.125,2.954 0.879,2.831 0.852,2.809 0.598,2.549 0.598,2.549 L 0,0 Z"/></g><g transform="translate(3.3687,15.624)" id="g46"><path id="path48" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.356,0 C 2.546,-0.213 2.969,-0.3 3.372,0.002 4.11,0.406 5.539,0 5.539,0 L 5.82,0.299 5.135,2.549 4.889,2.813 c 0,0 -0.529,0.317 -1.531,0.211 C 2.356,2.919 2.005,3.06 2.005,3.06 2.005,3.06 1.125,2.954 0.879,2.831 0.852,2.809 0.598,2.549 0.598,2.549 L 0,0 Z"/></g><g transform="translate(2.2134,18.9878)" id="g50"><path id="path52" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.262,1.851 2.035,1.727 2.482,2.188 4.022,0.299 5.259,1.178 6.016,1.809 6.47,1.53 8.077,2.566 6.624,1.204 5.419,0.348 4.459,-0.084 7.701,-3.906 7.278,-4.207 4.187,-0.457 3.185,-1.262 4.501,-1.683 4.459,-2.314 2.61,-1.804 2.692,-3.113 2.265,-3.298 1.887,-2.543 0.252,-4.46 l -0.588,1.01 1.851,1.557 0.042,0.547 1.009,0.925 0.295,0.043 0.841,0.336 -1.262,1.346 -1.686,-2.352 -0.723,0.87"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FCE100" 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="#141414" d="M0 13h36v10H0z"/><path fill="#007168" 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="#DD2E44" d="M1.313 29.945l15.719-11.881L1.33 6.041C.519 6.773 0 7.822 0 9v18c0 1.171.512 2.214 1.313 2.945z"/><path fill="#FCE100" d="M9.478 23.062l-3.271-2.395-3.267 2.395 1.267-3.851L.92 16.845l4.054.015 1.234-3.858 1.239 3.86 4.05-.018-3.288 2.371 1.269 3.847z"/><path fill="#141414" d="M3.369 20.702h2.356c.19.213.613.3 1.016-.002.738-.404 2.167.002 2.167.002l.281-.299-.686-2.25-.246-.264s-.528-.317-1.53-.211c-1.002.106-1.354-.036-1.354-.036s-.879.106-1.125.229c-.027.022-.282.281-.282.281l-.597 2.55z"/><path fill="#FFF" d="M3.369 20.376h2.356c.19.213.613.3 1.016-.002.738-.404 2.167.002 2.167.002l.281-.299-.686-2.25-.246-.264s-.528-.317-1.53-.211c-1.002.105-1.354-.036-1.354-.036s-.879.106-1.125.229c-.027.022-.282.281-.282.281l-.597 2.55z"/><path fill="#141414" d="M2.213 17.012l1.263-1.851.773.124.446-.46 1.541 1.888 1.236-.878.757-.632.454.279 1.607-1.036-1.453 1.362-1.205.856-.959.432 3.242 3.822-.424.301-3.091-3.75-1.002.805 1.317.421-.042.631-1.85-.51.083 1.309-.427.185-.378-.755-1.635 1.917-.589-1.01 1.851-1.557.042-.547 1.01-.925.294-.042.842-.337-1.263-1.346-1.686 2.352-.722-.87"/></svg> \ No newline at end of file |