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/1f699.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/1f699.svg')
-rw-r--r-- | public/emoji/1f699.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f699.svg b/public/emoji/1f699.svg index 18d132b01..28e277197 100644 --- a/public/emoji/1f699.svg +++ b/public/emoji/1f699.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,12)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -1,0 c -0.553,0 -1,0.447 -1,1 l 0,6 c 0,0.553 0.447,1 1,1 l 1,0 C -0.447,7 0,6.553 0,6 L 0,0 Z"/></g><g transform="translate(5,5)" id="g24"><path id="path26" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 26,0 c 1,0 3,1 3,4 0,2 0,8 -1,9 -1,1 0,7 -4,7 L 10,20 C 7,20 4,13 4,13 L 0,12 C 0,12 -4,11 -4,8 L -4,5 C -4,5 -5,4.662 -5,3.043 -5,1.424 -4,1 -4,1 L 0,0 Z"/></g><g transform="translate(13,5)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(11,5)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(31,5)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(29,5)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(24,19)" id="g44"><path id="path46" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 0.447,-1 1,-1 l 4,0 c 0.553,0 1,0.448 1,1 L 6,3 C 6,3.552 5.553,4 5,4 L 1,4 C 0.447,4 0,3.552 0,3 L 0,0 Z"/></g><g transform="translate(13,19)" id="g48"><path id="path50" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 0.448,-1 1,-1 l 7,0 c 0.553,0 1,0.448 1,1 L 9,3 C 9,3.552 8.553,4 8,4 L 3,4 C 2,4 0,1 0,0"/></g><g transform="translate(32,12.5)" id="g52"><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.672,-1.5 -1.5,-1.5 l -22,0 c -0.829,0 -1.5,0.672 -1.5,1.5 0,0.829 0.671,1.5 1.5,1.5 l 22,0 C -0.672,1.5 0,0.829 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M36 24c0 .553-.447 1-1 1h-1c-.553 0-1-.447-1-1v-6c0-.553.447-1 1-1h1c.553 0 1 .447 1 1v6z"/><path fill="#3B88C3" d="M5 31h26c1 0 3-1 3-4 0-2 0-8-1-9s0-7-4-7H15c-3 0-6 7-6 7l-4 1s-4 1-4 4v3s-1 .338-1 1.957S1 30 1 30l4 1z"/><circle fill="#292F33" cx="9" cy="31" r="4"/><circle fill="#CCD6DD" cx="9" cy="31" r="2"/><circle fill="#292F33" cx="27" cy="31" r="4"/><circle fill="#CCD6DD" cx="27" cy="31" r="2"/><path fill="#BBDDF5" d="M24 17c0 .552.447 1 1 1h4c.553 0 1-.448 1-1v-3c0-.552-.447-1-1-1h-4c-.553 0-1 .448-1 1v3zm-11 0c0 1 .448 1 1 1h7c.553 0 1-.448 1-1v-3c0-.552-.447-1-1-1h-5c-1 0-3 3-3 4z"/><path fill="#55ACEE" d="M32 23.5c0 .828-.672 1.5-1.5 1.5h-22c-.829 0-1.5-.672-1.5-1.5 0-.829.671-1.5 1.5-1.5h22c.828 0 1.5.671 1.5 1.5z"/></svg> \ No newline at end of file |