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/1f989.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/1f989.svg')
-rw-r--r-- | public/emoji/1f989.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f989.svg b/public/emoji/1f989.svg index 10a2cbaa2..bb0d461ab 100644 --- a/public/emoji/1f989.svg +++ b/public/emoji/1f989.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(7.3169,25)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.723,-9.083 0.958,-18 0.958,-18 0,0 2.875,0.442 6.875,5.2 C 11.834,-8.042 0,0 0,0"/></g><g transform="translate(28.6592,25)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.723,-9.083 -0.958,-18 -0.958,-18 0,0 -2.874,0.442 -6.875,5.2 C -11.834,-8.042 0,0 0,0"/></g><g transform="translate(15.2026,4.4434)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.123,0.229 -0.317,0.384 -0.531,0.496 -2.032,2.172 -0.589,4.717 -0.589,4.717 0,0.703 1.272,2.544 0,2.544 L -2.392,6.484 C -3.664,5.213 -3.664,1.396 -3.664,1.396 l -2.544,0 c -0.703,0 -1.272,-0.569 -1.272,-1.273 0,-0.701 0.569,-1.27 1.272,-1.27 l 1.408,0 -0.282,-0.154 C -5.7,-1.635 -5.929,-2.406 -5.596,-3.026 -5.261,-3.643 -4.49,-3.874 -3.872,-3.54 l 3.358,1.816 C 0.104,-1.391 0.332,-0.619 0,0"/></g><g transform="translate(20.7988,4.4434)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.123,0.229 0.317,0.384 0.53,0.496 2.034,2.172 0.589,4.717 0.589,4.717 0,0.703 -1.271,2.544 0,2.544 L 2.392,6.484 C 3.664,5.213 3.664,1.396 3.664,1.396 l 2.544,0 c 0.704,0 1.271,-0.569 1.271,-1.273 0,-0.701 -0.567,-1.27 -1.271,-1.27 l -1.408,0 0.281,-0.154 C 5.701,-1.635 5.929,-2.406 5.596,-3.026 5.26,-3.643 4.49,-3.874 3.87,-3.54 L 0.514,-1.724 C -0.104,-1.391 -0.333,-0.619 0,0"/></g><g transform="translate(28.2783,24.7085)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.891,6.092 0,10.542 0,10.542 0,0 -5.781,-0.959 -6.744,-2.875 C -7.963,5.242 0,0 0,0"/></g><g transform="translate(29.5625,23.2622)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-10.297 -3.152,-20.595 -11.563,-20.595 -8.409,0 -11.562,10.298 -11.562,20.595 0,10.298 5.177,10.654 11.562,10.654 C -5.176,10.654 0,10.298 0,0"/></g><g transform="translate(27.666,18.2617)" id="g44"><path id="path46" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-10.297 -7.774,-14.595 -9.666,-14.595 -1.892,0 -9.666,4.298 -9.666,14.595 C -19.332,10.298 0,10.298 0,0"/></g><g transform="translate(7.7217,24.7085)" id="g48"><path id="path50" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.891,6.092 0,10.542 0,10.542 0,0 5.782,-0.959 6.746,-2.875 C 7.964,5.242 0,0 0,0"/></g><g transform="translate(14.9287,31.6265)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.227,1.584 -7.207,3.624 -7.207,3.624 0,0 -2.076,-3.221 -0.927,-7.926 0.446,-2.137 1.94,-4.196 3.904,-4.662 2.636,-0.627 7.301,0.049 7.301,3.963 C 3.071,-2.306 1.997,-0.749 0,0"/></g><g transform="translate(21.0713,31.6265)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.227,1.584 7.206,3.624 7.206,3.624 0,0 2.076,-3.221 0.928,-7.926 -0.446,-2.137 -1.94,-4.196 -3.903,-4.662 -2.637,-0.627 -7.302,0.049 -7.302,3.963 0,2.695 1.074,4.252 3.071,5.001"/></g><g transform="translate(16.0835,27.5835)" id="g60"><path id="path62" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.117 -1.716,-3.833 -3.833,-3.833 -2.117,0 -3.834,1.716 -3.834,3.833 0,2.117 1.717,3.833 3.834,3.833 C -1.716,3.833 0,2.117 0,0"/></g><g transform="translate(27.583,27.5835)" id="g64"><path id="path66" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.117 -1.716,-3.833 -3.833,-3.833 -2.117,0 -3.833,1.716 -3.833,3.833 0,2.117 1.716,3.833 3.833,3.833 C -1.716,3.833 0,2.117 0,0"/></g><g transform="translate(14.1665,27.5835)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.059 -0.858,-1.917 -1.917,-1.917 -1.058,0 -1.916,0.858 -1.916,1.917 0,1.058 0.858,1.917 1.916,1.917 C -0.858,1.917 0,1.058 0,0"/></g><g transform="translate(25.667,27.5835)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.059 -0.858,-1.917 -1.917,-1.917 -1.059,0 -1.917,0.858 -1.917,1.917 0,1.058 0.858,1.917 1.917,1.917 C -0.858,1.917 0,1.058 0,0"/></g><g transform="translate(20.875,23.271)" id="g76"><path id="path78" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.382 -2.875,-3.354 -2.875,-3.354 0,0 -2.875,0.972 -2.875,3.354 0,2.382 2.875,3.354 2.875,3.354 C -2.875,3.354 0,2.382 0,0"/></g><g transform="translate(20.875,23.271)" id="g80"><path id="path82" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.382 -2.875,-3.354 -2.875,-3.354 0,0 -2.875,0.972 -2.875,3.354 1.198,-1.198 2.875,-1.437 2.875,-1.437 0,0 1.677,0.239 2.875,1.437"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M7.317 11c-5.723 9.083.958 18 .958 18s2.874-.442 6.875-5.2c4-4.758-7.833-12.8-7.833-12.8zm21.342 0c5.723 9.083-.958 18-.958 18s-2.874-.442-6.875-5.2C16.825 19.042 28.659 11 28.659 11z"/><path fill="#FFAC33" d="M15.203 31.557c-.123-.229-.317-.384-.531-.496-2.032-2.172-.589-4.717-.589-4.717 0-.703 1.271-2.544 0-2.544l-1.272 1.272c-1.272 1.271-1.272 5.089-1.272 5.089H8.995c-.703 0-1.272.568-1.272 1.272 0 .701.569 1.271 1.272 1.271h1.408l-.282.153c-.618.334-.848 1.105-.514 1.726.334.616 1.106.848 1.724.514l3.357-1.816c.619-.334.846-1.105.515-1.724zm5.596 0c.123-.229.317-.384.53-.496 2.033-2.172.589-4.717.589-4.717 0-.703-1.271-2.544 0-2.544l1.272 1.272c1.273 1.271 1.273 5.089 1.273 5.089h2.544c.704 0 1.271.568 1.271 1.272 0 .701-.566 1.271-1.271 1.271h-1.408l.281.153c.62.334.848 1.105.515 1.726-.336.616-1.105.848-1.726.514l-3.356-1.816c-.619-.334-.847-1.105-.514-1.724z"/><path fill="#662113" d="M28.278 11.292c2.891-6.092 0-10.542 0-10.542s-5.781.959-6.744 2.875c-1.219 2.424 6.744 7.667 6.744 7.667z"/><path fill="#662113" d="M29.562 12.738c0 10.297-3.152 20.595-11.562 20.595-8.409 0-11.563-10.298-11.563-20.595C6.437 2.44 11.614 2.083 18 2.083c6.387 0 11.562.357 11.562 10.655z"/><path fill="#C1694F" d="M27.666 17.738c0 10.297-7.774 14.595-9.666 14.595s-9.666-4.298-9.666-14.595c0-10.298 19.332-10.298 19.332 0z"/><path fill="#662113" d="M7.722 11.292C4.831 5.2 7.722.75 7.722.75s5.782.959 6.746 2.875c1.218 2.424-6.746 7.667-6.746 7.667z"/><path fill="#C1694F" d="M14.929 4.373C10.702 2.789 7.722.75 7.722.75s-2.076 3.221-.928 7.926c.446 2.137 1.94 4.195 3.904 4.662 2.637.627 7.302-.049 7.302-3.963 0-2.695-1.074-4.252-3.071-5.002zm6.142 0C25.298 2.789 28.277.75 28.277.75s2.076 3.221.928 7.926c-.445 2.137-1.939 4.195-3.902 4.662-2.638.627-7.303-.049-7.303-3.963 0-2.695 1.074-4.252 3.071-5.002z"/><path fill="#FFD983" d="M16.083 8.417c0 2.117-1.716 3.833-3.833 3.833s-3.833-1.716-3.833-3.833 1.717-3.833 3.833-3.833c2.117-.001 3.833 1.716 3.833 3.833zm11.5 0c0 2.117-1.716 3.833-3.833 3.833s-3.833-1.716-3.833-3.833 1.716-3.833 3.833-3.833 3.833 1.716 3.833 3.833z"/><path fill="#292F33" d="M14.167 8.417c0 1.059-.858 1.917-1.917 1.917s-1.917-.858-1.917-1.917c0-1.058.858-1.917 1.917-1.917s1.917.858 1.917 1.917zm11.5 0c0 1.059-.858 1.917-1.917 1.917s-1.917-.858-1.917-1.917c0-1.058.858-1.917 1.917-1.917s1.917.858 1.917 1.917z"/><path fill="#FFCC4D" d="M20.875 12.729c0 2.382-2.875 3.354-2.875 3.354s-2.875-.973-2.875-3.354S18 9.375 18 9.375s2.875.972 2.875 3.354z"/><path fill="#F4900C" d="M20.875 12.729c0 2.382-2.875 3.354-2.875 3.354s-2.875-.973-2.875-3.354C16.323 13.927 18 14.167 18 14.167s1.677-.24 2.875-1.438z"/></svg> \ No newline at end of file |