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/1f6aa.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/1f6aa.svg')
-rw-r--r-- | public/emoji/1f6aa.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6aa.svg b/public/emoji/1f6aa.svg index 6743f42f6..1542aba5f 100644 --- a/public/emoji/1f6aa.svg +++ b/public/emoji/1f6aa.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(34,4)" id="g20"><path id="path22" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,28 c 0,2.209 -1.791,4 -4,4 l -18,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-28 -3,0 c -1.104,0 -2,-0.895 -2,-2 0,-1.105 0.896,-2 2,-2 l 32,0 c 1.105,0 2,0.895 2,2 0,1.105 -0.895,2 -2,2"/></g><g transform="translate(29,3)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -16,0 c -1.657,0 -3,1.343 -3,3 l 0,28 c 0,1.657 1.343,3 3,3 l 16,0 c 1.657,0 3,-1.343 3,-3 L 0,0 Z"/></g><g transform="translate(14,16.5)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.38 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.38 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(13,16.5)" id="g32"><path id="path34" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.828 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(26,20)" id="g36"><path id="path38" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 l 3,0 0,7 c 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(20,22)" id="g40"><path id="path42" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,8 c 0,0.552 0.447,1 1,1 l 4,0 C 4.553,10 5,9.552 5,9 5,8.448 4.553,8 4,8 L 1,8 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(16,20)" id="g44"><path id="path46" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 3,0 0,7 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(10,22)" id="g48"><path id="path50" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,8 c 0,0.552 0.448,1 1,1 l 4,0 C 4.552,10 5,9.552 5,9 5,8.448 4.552,8 4,8 L 1,8 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(26,2)" id="g52"><path id="path54" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 3,0 0,6 C -1,8.553 -0.553,9 0,9 0.553,9 1,8.553 1,8 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(20,4)" id="g56"><path id="path58" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,7 c 0,0.553 0.447,1 1,1 L 4,9 C 4.553,9 5,8.553 5,8 5,7.447 4.553,7 4,7 L 1,7 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(16,2)" id="g60"><path id="path62" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 3,0 0,6 C -1,8.553 -0.552,9 0,9 0.552,9 1,8.553 1,8 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(10,4)" id="g64"><path id="path66" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,7 c 0,0.553 0.448,1 1,1 L 4,9 C 4.552,9 5,8.553 5,8 5,7.447 4.552,7 4,7 L 1,7 1,1 C 1,0.447 0.552,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BF6952" d="M29 34c0 1.105-.895 2-2 2H9c-1.105 0-2-.895-2-2V2c0-1.105.895-2 2-2h18c1.105 0 2 .895 2 2v32z"/><circle fill="#FFAC33" cx="11" cy="18" r="1.5"/><path fill="#AC5640" d="M25 3c-.552 0-1 .448-1 1v9H11c-.552 0-1 .448-1 1s.448 1 1 1h14c.552 0 1-.448 1-1V4c0-.552-.448-1-1-1zm0 25c.552 0 1 .448 1 1v3c0 .552-.448 1-1 1H11c-.552 0-1-.448-1-1s.448-1 1-1h13v-2c0-.552.448-1 1-1z"/><path fill="#854836" d="M11 33c-.552 0-1-.448-1-1v-3c0-.552.448-1 1-1h14c.552 0 1 .448 1 1s-.448 1-1 1H12v2c0 .552-.448 1-1 1z"/><path fill="#AC5640" d="M25 21c.552 0 1 .448 1 1v3c0 .552-.448 1-1 1H11c-.552 0-1-.448-1-1s.448-1 1-1h13v-2c0-.552.448-1 1-1z"/><path fill="#854836" d="M11 26c-.552 0-1-.448-1-1v-3c0-.552.448-1 1-1h14c.552 0 1 .448 1 1s-.448 1-1 1H12v2c0 .552-.448 1-1 1zm0-11c-.552 0-1-.448-1-1V4c0-.552.448-1 1-1h14c.552 0 1 .448 1 1s-.448 1-1 1H12v9c0 .552-.448 1-1 1z"/></svg> \ No newline at end of file |