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/1f693.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/1f693.svg')
-rw-r--r-- | public/emoji/1f693.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f693.svg b/public/emoji/1f693.svg index 3241874c6..cbf344d7c 100644 --- a/public/emoji/1f693.svg +++ b/public/emoji/1f693.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(32,14)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,8 -5,8 l -11,0 c -3,0 -7,-7 -7,-7 0,0 -8,-1 -8,-5 l 0,-2 c 0,-0.09 0.021,-0.175 0.026,-0.263 C -31.583,-6.605 -32,-7.251 -32,-8 c 0,-1.104 0.896,-2 2,-2 l 3,0 2,0 25,0 c 2.209,0 4,1.791 4,4 l 0,2 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(1,10)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-2 C 0,-2.09 0.021,-2.175 0.026,-2.263 -0.583,-2.605 -1,-3.251 -1,-4 c 0,-1.104 0.896,-2 2,-2 l 3,0 2,0 25,0 c 2.209,0 4,1.791 4,4 l 0,2 c 0,0.348 -0.059,0.679 -0.142,1 L 0.201,1 C 0.083,0.687 0,0.359 0,0"/></g><g transform="translate(15.9102,4)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.055,0.326 0.09,0.658 0.09,1 0,3.314 -2.687,6 -6,6 -3.314,0 -6,-2.686 -6,-6 0,-0.342 0.035,-0.674 0.09,-1 L 0,0 Z"/></g><g transform="translate(32.9102,4)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.055,0.326 0.09,0.658 0.09,1 0,3.314 -2.687,6 -6,6 -3.314,0 -6,-2.686 -6,-6 0,-0.342 0.035,-0.674 0.09,-1 L 0,0 Z"/></g><g transform="translate(14,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(12,5)" id="g40"><path id="path42" style="fill:#e1e8ed;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="g44"><path id="path46" 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="g48"><path id="path50" style="fill:#e1e8ed;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(21,23)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -3,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 3,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(22,23)" id="g56"><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -2,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 2,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(23,15)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 7,0 C 7,0 5,5 4,5 L 0,5 0,0 Z"/></g><g transform="translate(21,20)" id="g64"><path id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -2,0 -5,-5 -5,-5 l 10,0 0,5 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M32 22s-2-8-5-8H16c-3 0-7 7-7 7s-8 1-8 5v2c0 .09.021.175.026.263C.417 28.605 0 29.251 0 30c0 1.104.896 2 2 2h30c2.209 0 4-1.791 4-4v-2c0-2.209-1.791-4-4-4z"/><path fill="#292F33" d="M1 26v2c0 .09.021.175.026.263C.417 28.605 0 29.251 0 30c0 1.104.896 2 2 2h30c2.209 0 4-1.791 4-4v-2c0-.348-.059-.679-.142-1H1.201c-.117.312-.201.641-.201 1z"/><path fill="#66757F" d="M15.91 32c.055-.326.09-.658.09-1 0-3.313-2.686-6-6-6-3.313 0-6 2.687-6 6 0 .342.035.674.09 1h11.82zm17 0c.055-.326.09-.658.09-1 0-3.313-2.687-6-6-6s-6 2.687-6 6c0 .342.035.674.09 1h11.82z"/><circle fill="#292F33" cx="10" cy="31" r="4"/><circle fill="#E1E8ED" cx="10" cy="31" r="2"/><circle fill="#292F33" cx="27" cy="31" r="4"/><circle fill="#E1E8ED" cx="27" cy="31" r="2"/><path fill="#DD2E44" d="M21 13c0 .552-.447 1-1 1h-3c-.552 0-1-.448-1-1s.448-1 1-1h3c.553 0 1 .448 1 1z"/><path fill="#55ACEE" d="M22 13c0 .552-.447 1-1 1h-2c-.552 0-1-.448-1-1s.448-1 1-1h2c.553 0 1 .448 1 1zm1 8h7s-2-5-3-5h-4v5zm-2-5h-5c-2 0-5 5-5 5h10v-5z"/></svg> \ No newline at end of file |