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/1f39a.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/1f39a.svg')
-rw-r--r-- | public/emoji/1f39a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f39a.svg b/public/emoji/1f39a.svg index 28cd6ecd0..7071931fc 100644 --- a/public/emoji/1f39a.svg +++ b/public/emoji/1f39a.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(33,4)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -22,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 22,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(19,5)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 l 0,26 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(15,30)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 l -4,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 4,0 C -0.448,1 0,0.552 0,0"/></g><g transform="translate(15,18)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -4,0 c -0.552,0 -1,0.447 -1,1 0,0.552 0.448,1 1,1 l 4,0 C -0.448,1 0,0.552 0,0"/></g><g transform="translate(15,6)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -4,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 4,0 C -0.448,1 0,0.553 0,0"/></g><g transform="translate(27,30)" id="g40"><path id="path42" style="fill:#99aab5;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 0,0.552 0.447,1 1,1 l 4,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(27,18)" id="g44"><path id="path46" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -4,0 c -0.553,0 -1,0.447 -1,1 0,0.552 0.447,1 1,1 l 4,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(27,6)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -4,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 4,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(15,11.8936)" id="g52"><path id="path54" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.493 -0.4,-0.894 -0.893,-0.894 l -2.214,0 C -3.6,-0.894 -4,-0.493 -4,0 l 0,0.213 c 0,0.493 0.4,0.893 0.893,0.893 l 2.214,0 C -0.4,1.106 0,0.706 0,0.213 L 0,0 Z"/></g><g transform="translate(25,11.8936)" id="g56"><path id="path58" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.493 -0.4,-0.894 -0.893,-0.894 l -2.214,0 C -3.6,-0.894 -4,-0.493 -4,0 l 0,0.213 c 0,0.493 0.4,0.893 0.893,0.893 l 2.214,0 C -0.4,1.106 0,0.706 0,0.213 L 0,0 Z"/></g><g transform="translate(25,23)" id="g60"><path id="path62" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -10,0 c -1.104,0 -2,0.896 -2,2 l 0,2 c 0,1.104 0.896,2 2,2 L -2,4 C -0.895,4 0,3.104 0,2 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M33 32c0 2.209-1.791 4-4 4H7c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h22c2.209 0 4 1.791 4 4v28z"/><path fill="#292F33" d="M19 31c0 .553-.448 1-1 1s-1-.447-1-1V5c0-.552.448-1 1-1s1 .448 1 1v26z"/><path fill="#99AAB5" d="M15 6c0 .552-.448 1-1 1h-4c-.552 0-1-.448-1-1s.448-1 1-1h4c.552 0 1 .448 1 1zm0 12c0 .553-.448 1-1 1h-4c-.552 0-1-.447-1-1 0-.552.448-1 1-1h4c.552 0 1 .448 1 1zm0 12c0 .553-.448 1-1 1h-4c-.552 0-1-.447-1-1 0-.553.448-1 1-1h4c.552 0 1 .447 1 1zM27 6c0 .552-.447 1-1 1h-4c-.553 0-1-.448-1-1s.447-1 1-1h4c.553 0 1 .448 1 1zm0 12c0 .553-.447 1-1 1h-4c-.553 0-1-.447-1-1 0-.552.447-1 1-1h4c.553 0 1 .448 1 1zm0 12c0 .553-.447 1-1 1h-4c-.553 0-1-.447-1-1 0-.553.447-1 1-1h4c.553 0 1 .447 1 1zm-12-5.894c0 .494-.4.894-.893.894h-2.214c-.493 0-.893-.4-.893-.894v-.213c0-.493.4-.893.893-.893h2.214c.493 0 .893.4.893.894v.212zm10 0c0 .494-.4.894-.893.894h-2.215c-.492 0-.892-.4-.892-.894v-.213c0-.493.4-.893.893-.893h2.215c.492 0 .892.4.892.894v.212z"/><path fill="#269" d="M25 13c0 1.104-.896 2-2 2H13c-1.104 0-2-.896-2-2v-2c0-1.104.896-2 2-2h10c1.104 0 2 .896 2 2v2z"/></svg> \ No newline at end of file |