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/1f9d2-1f3fb.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/1f9d2-1f3fb.svg')
| -rw-r--r-- | public/emoji/1f9d2-1f3fb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9d2-1f3fb.svg b/public/emoji/1f9d2-1f3fb.svg index ee17b4cbe..188dea00e 100644 --- a/public/emoji/1f9d2-1f3fb.svg +++ b/public/emoji/1f9d2-1f3fb.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(22,21.0005)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4,0 -9,3 -9,3 l -3,-3 c -1.863,-1.863 -3.724,-2.372 -3.971,-5.313 C -15.971,-14 -11.208,-19 -4,-19 3.208,-19 7.965,-15 7.965,-5.45 7.613,-1.82 3.81,0 0,0"/></g><g transform="translate(22.707,9.707)" id="g24"><path id="path26" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.387,0.387 -0.93,0.192 -1.404,0.01 -0.474,-0.183 -1.553,-0.717 -3.303,-0.717 -1.75,0 -2.829,0.534 -3.303,0.717 -0.474,0.182 -1.017,0.377 -1.404,-0.01 -0.391,-0.391 -0.391,-1.023 0,-1.414 0.132,-0.133 1.936,-1.293 4.707,-1.293 2.771,0 4.575,1.16 4.707,1.293 0.391,0.391 0.391,1.023 0,1.414"/></g><g transform="translate(19,11)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(14,13)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(22,13)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(17.9976,31)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 8.205,0 13.331,-5.955 13.331,-11 0,-5.044 -1.025,-8.245 -2.051,-6.226 -1.026,2.017 -2.051,4.035 -2.051,4.035 0,0 -6.152,0 -8.203,2.019 0,0 3.076,-6.054 -3.077,0 0,0 1.025,-4.037 -5.127,1.008 0,0 -3.077,-2.018 -4.103,-7.062 -0.284,-1.401 -2.051,1.182 -2.051,6.226 0,5.045 4.102,11 13.332,11"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M22 15c-4 0-9-3-9-3l-3 3c-1.863 1.863-3.724 2.372-3.971 5.313C6.029 29 10.792 34 18 34s11.965-4 11.965-13.551C29.613 16.819 25.81 15 22 15z"/><path d="M22.707 26.293c-.387-.387-.93-.192-1.404-.01-.474.183-1.553.717-3.303.717s-2.829-.534-3.303-.717c-.474-.183-1.017-.377-1.404.01-.391.391-.391 1.023 0 1.414C13.425 27.84 15.229 29 18 29s4.575-1.16 4.707-1.293c.391-.391.391-1.023 0-1.414zM19 25h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#C1694F"/><path d="M14 23c-.552 0-1-.447-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .553-.448 1-1 1zm8 0c-.553 0-1-.447-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .553-.447 1-1 1z" fill="#662113"/><path fill="#292F33" d="M17.998 5c8.205 0 13.331 5.955 13.331 11 0 5.044-1.026 8.245-2.051 6.226l-2.051-4.035s-6.152 0-8.203-2.019c0 0 3.077 6.054-3.077 0 0 0 1.026 4.037-5.127-1.008 0 0-3.077 2.018-4.102 7.062-.286 1.401-2.052-1.182-2.052-6.226 0-5.045 4.102-11 13.332-11"/></svg> \ No newline at end of file |
