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/1f1f9-1f1eb.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/1f1f9-1f1eb.svg')
-rw-r--r-- | public/emoji/1f1f9-1f1eb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f9-1f1eb.svg b/public/emoji/1f1f9-1f1eb.svg index 015fbf976..cf4bfacfc 100644 --- a/public/emoji/1f1f9-1f1eb.svg +++ b/public/emoji/1f1f9-1f1eb.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:#002395;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(6,31)" id="g24"><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-12 -6,0 0,-1 19,0 0,13 -13,0 z"/></g><path id="path28" style="fill:#ed2939;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,19 -6,0 0,12 6,0 0,-12 z"/><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,19 -6,0 0,12 6,0 0,-12 z"/><g transform="translate(29.9639,15.9062)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.701,-2.631 0,4.763 2.268,0 0.838,0.961 -3.88,0 -3.879,0 0.837,-0.961 2.269,0 0,-4.763 -1.701,2.631 -2.475,-3.867 1.237,0 1.238,2.035 2.474,-4.356 2.475,4.356 1.238,-2.035 1.238,0 L 0,0 Z"/></g><g transform="translate(27.0127,16.9951)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 3.119,0 -0.687,-0.941 -2.269,0 L 0,0 Z"/></g><path id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26.252,12.359 -2.476,0 0,0.617 2.476,0 0,-0.617 z"/><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31.202,12.359 -2.475,0 0,0.617 2.475,0 0,-0.617 z"/><g transform="translate(27.4893,8.7939)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.299,-1.027 1.034,0 -0.816,-0.66 0.298,-1.015 -0.815,0.62 -0.816,-0.604 0.299,1 -0.816,0.659 1.007,0 L 0,0 Z"/></g><g transform="translate(22.1523,18)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.299,-1.026 1.034,0 -0.815,-0.632 0.298,-1 -0.816,0.627 -0.815,-0.6 0.298,0.973 -0.815,0.632 1.006,0 L 0,0 Z"/></g><g transform="translate(32.8252,18)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.3,-1.026 1.033,0 -0.815,-0.632 0.298,-1 -0.816,0.627 -0.814,-0.6 0.297,0.973 -0.815,0.632 1.007,0 L 0,0 Z"/></g><g transform="translate(24.5605,10.8496)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.298,-1.026 1.034,0 L 0.517,-1.668 0.814,-2.673 0,-2.048 l -0.816,-0.6 0.299,0.981 -0.816,0.641 1.006,0 L 0,0 Z"/></g><g transform="translate(30.418,10.8496)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.3,-1.026 1.033,0 L 0.517,-1.668 0.816,-2.673 0,-2.048 l -0.814,-0.6 0.297,0.981 -0.815,0.641 1.007,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#002395" d="M32 5H18v12H0v10c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M0 16h19v2H0z"/><path fill="#002395" d="M6 17H0V9c0-2.209 1.791-4 4-4h2v12z"/><path fill="#EEE" d="M6 5h6v12H6zm11 0h2v13h-2z"/><path fill="#ED2939" d="M12 5h6v12h-6z"/><g fill="#FFF"><path d="M29.964 20.094l-1.701 2.631v-4.763h2.268l.838-.962h-7.76l.838.962h2.269v4.763l-1.701-2.631-2.475 3.867h1.236l1.239-2.035 2.474 4.356 2.475-4.356 1.238 2.035h1.237z"/><path d="M27 19.005h3.132l-.688.941H27zm-3.224 4.018h2.476v.617h-2.476zm4.952 0h2.475v.617h-2.475zm-1.239 4.183l.299 1.027h1.034l-.816.661.299 1.014-.816-.62-.815.604.299-1-.817-.659h1.007zM22.152 18l.299 1.026h1.034l-.815.632.298 1-.816-.627-.815.6.299-.973-.816-.632h1.006zm10.673 0l.3 1.026h1.033l-.815.632.299 1-.817-.627-.814.6.298-.973-.816-.632H32.5zm-8.265 7.15l.298 1.027h1.035l-.816.641.298 1.005-.815-.625-.816.601.3-.982-.816-.64h1.005zm5.858 0l.3 1.027h1.033l-.816.641.299 1.005-.816-.625-.814.601.297-.982-.815-.64h1.007z"/></g></svg> \ No newline at end of file |