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-1f1f3.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-1f1f3.svg')
-rw-r--r-- | public/emoji/1f1f2-1f1f3.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f2-1f1f3.svg b/public/emoji/1f1f2-1f1f3.svg index 6987e1262..b9635cf7b 100644 --- a/public/emoji/1f1f2-1f1f3.svg +++ b/public/emoji/1f1f2-1f1f3.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:#c4272f;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:#005197;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 24,5 12,5 12,31 24,31 24,5 Z"/><path id="path26" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 2.857,7 -1.571,0 0,12.571 1.571,0 0,-12.571 z"/><path id="path28" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 8.319,16.428 -4.639,0 0,0.786 4.639,0 0,-0.786 z"/><path id="path30" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10.714,7 -1.571,0 0,12.571 1.571,0 0,-12.571 z"/><path id="path32" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 8.319,9.357 -4.639,0 0,0.786 4.639,0 0,-0.786 z"/><g transform="translate(3.7681,19.5713)" id="g34"><path id="path36" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4.464,0 2.232,-1.561 0,0 Z"/></g><g transform="translate(3.6807,8.373)" id="g38"><path id="path40" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4.639,0 2.319,-1.622 0,0 Z"/></g><g transform="translate(7.5713,24.2856)" id="g42"><path id="path44" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.869 -0.704,-1.571 -1.571,-1.571 -0.868,0 -1.572,0.702 -1.572,1.571 0,0.869 0.704,1.571 1.572,1.571 C -0.704,1.571 0,0.869 0,0"/></g><g transform="translate(6.7856,27.2319)" id="g46"><path id="path48" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.759 -0.352,-0.982 -0.786,-0.982 -0.434,0 -0.785,0.223 -0.785,0.982 0,0.76 0.54,1.768 0.785,1.768 C -0.54,1.768 0,0.76 0,0"/></g><g transform="translate(6,21.5957)" id="g50"><path id="path52" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.303,0 -2.438,0.593 -3.084,1.477 -2.813,0.016 -1.538,-1.089 0,-1.089 c 1.538,0 2.813,1.105 3.084,2.566 C 2.438,0.593 1.303,0 0,0"/></g><g transform="translate(5.6294,11.916)" id="g54"><path id="path56" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.23 0.183,0.413 0.413,0.413 0.642,0.413 0.825,0.23 0.825,0 0.825,-0.227 0.642,-0.414 0.413,-0.414 0.183,-0.414 0,-0.227 0,0 m 2.94,1.37 c 0,1.095 -0.687,2.023 -1.649,2.39 0.299,-0.257 0.58,-0.447 0.58,-1.063 0,-0.972 -0.579,-1.496 -1.5,-1.496 l 0,-0.008 C -0.272,1.169 -0.788,0.645 -0.788,0 c 0,-0.645 0.516,-1.167 1.159,-1.191 l 0,-0.008 c 0.009,0 0.018,0.002 0.028,0.003 0.005,-0.001 0.009,-0.003 0.014,-0.003 0.014,0 0.027,0.008 0.041,0.008 1.379,0.045 2.486,1.169 2.486,2.561"/></g><g transform="translate(5.9687,14.2275)" id="g58"><path id="path60" style="fill:#f9cf01;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,0 -0.417,0.189 -0.417,0.417 0,0.229 0.186,0.419 0.417,0.419 0.231,0 0.417,-0.19 0.417,-0.419 C 0.417,0.189 0.231,0 0,0 m 0.031,1.621 0,0.006 C 0.024,1.627 0.018,1.625 0.01,1.625 0.007,1.625 0.004,1.627 0,1.627 -0.011,1.627 -0.02,1.621 -0.031,1.621 -1.42,1.587 -2.538,0.459 -2.538,-0.941 c 0,-1.096 0.686,-2.024 1.649,-2.391 -0.299,0.257 -0.557,0.448 -0.557,0.999 0,0.981 0.524,1.523 1.43,1.523 l 0.002,0.018 c 0.005,0 0.009,-0.003 0.014,-0.003 0.668,0 1.211,0.546 1.211,1.212 0,0.657 -0.527,1.186 -1.18,1.204"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C4272F" 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="#005197" d="M12 5h12v26H12z"/><g fill="#F9CF01"><path d="M1.286 16.429h1.571V29H1.286zm2.395 2.357H8.32v.786H3.681zm5.462-2.357h1.571V29H9.143zm-5.462 9.427H8.32v.786H3.681zm.087-9.427h4.464L6 17.989zm-.087 11.198h4.638L6 29.249zm3.89-15.913c0 .869-.704 1.571-1.571 1.571s-1.571-.703-1.571-1.571c0-.869.704-1.571 1.571-1.571s1.571.703 1.571 1.571zm-.785-2.946c0 .759-.352.982-.786.982s-.786-.223-.786-.982C5.214 8.008 5.754 7 6 7s.786 1.008.786 1.768z"/><path d="M6 14.404c-1.303 0-2.438-.593-3.084-1.477.271 1.462 1.546 2.567 3.084 2.567s2.813-1.105 3.084-2.566c-.646.883-1.781 1.476-3.084 1.476zm2.569 8.31c0-1.095-.687-2.022-1.649-2.39.299.257.58.447.58 1.062 0 .973-.578 1.496-1.5 1.496v.009c-.642.024-1.158.547-1.158 1.193 0 .645.516 1.167 1.158 1.191v.008c.01 0 .018-.003.028-.003.005 0 .009.003.014.003.015 0 .027-.008.042-.008 1.379-.045 2.485-1.169 2.485-2.561zm-2.94 1.37c0-.229.183-.413.413-.413.229 0 .413.184.413.413 0 .228-.183.414-.413.414-.23 0-.413-.186-.413-.414z"/><path d="M6 20.152v-.006l-.021.002-.01-.002c-.011 0-.02.006-.031.006-1.389.034-2.507 1.162-2.507 2.562 0 1.096.687 2.023 1.649 2.391-.299-.257-.557-.448-.557-.999 0-.98.524-1.522 1.43-1.522l.002-.018c.005 0 .009.003.014.003.668 0 1.211-.546 1.211-1.212 0-.659-.527-1.188-1.18-1.205zm-.031 1.62c-.231 0-.417-.188-.417-.417 0-.229.185-.419.417-.419s.417.189.417.419c-.001.229-.186.417-.417.417z"/></g></svg> \ No newline at end of file |