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/1f1e8-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/1f1e8-1f1eb.svg')
-rw-r--r-- | public/emoji/1f1e8-1f1eb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e8-1f1eb.svg b/public/emoji/1f1e8-1f1eb.svg index d9fcde0a9..72166cbe0 100644 --- a/public/emoji/1f1e8-1f1eb.svg +++ b/public/emoji/1f1e8-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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#003082;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,24.5 15,0 0,6.5 -15,0 0,-6.5 z"/><g transform="translate(6.1976,26.2941)" id="g22"><path id="path24" style="fill:#003082;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.781,-1.294 0.68,2.094 -1.781,1.294 2.202,0 L 0,4.188 0.68,2.094 2.882,2.094 1.101,0.8 1.781,-1.294 0,0 Z m 8.802,4.706 -15,0 0,-6.5 15,0 0,6.5 z"/></g><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,18 15,0 0,6.5 -15,0 0,-6.5 z"/><path id="path28" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,24.5 -15,0 0,-6.5 15,0 0,6.5 z"/><path id="path30" style="fill:#289728;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,18 -15,0 0,-6.5 15,0 0,6.5 z"/><path id="path32" style="fill:#289728;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,11.5 15,0 0,6.5 -15,0 0,-6.5 z"/><path id="path34" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,5 15,0 0,6.5 -15,0 0,-6.5 z"/><path id="path36" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,5 15,0 0,6.5 -15,0 L 0,5 Z"/><g transform="translate(21,18)" id="g38"><path id="path40" style="fill:#d21034;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,6.5 0,13 -6,13 -6,6.5 -6,0 -6,-6.5 -6,-13 0,-13 0,-6.5 0,0 Z"/></g><g transform="translate(9.0796,28.3879)" id="g42"><path id="path44" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.202,0 -2.882,2.094 -3.562,0 l -2.202,0 1.781,-1.294 -0.68,-2.094 1.781,1.294 1.781,-1.294 -0.68,2.094 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#003082" d="M32 5H4C1.791 5 0 6.791 0 9v2.5h36V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M0 11.5h36V18H0z"/><path fill="#289728" d="M0 18h36v6.5H0z"/><path fill="#FFCE00" d="M0 24.5V27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-2.5H0z"/><path fill="#D21034" d="M15 5h6v26h-6z"/><path fill="#FFCE00" d="M6.878 7.612l-.68-2.094-.681 2.094H3.316l1.781 1.294L4.417 11l1.781-1.294L7.979 11l-.681-2.094L9.08 7.612z"/></svg> \ No newline at end of file |