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/1f481-1f3fb-200d-2642-fe0f.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/1f481-1f3fb-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f481-1f3fb-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f481-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f481-1f3fb-200d-2642-fe0f.svg index 9fce17c57..1b649a27a 100644 --- a/public/emoji/1f481-1f3fb-200d-2642-fe0f.svg +++ b/public/emoji/1f481-1f3fb-200d-2642-fe0f.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,9)" id="g20"><path id="path22" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path24" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,0 -1,0 0,4 1,0 0,-4 z"/><path id="path26" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 5,0 4,0 4,4 5,4 5,0 Z"/><g transform="translate(10,14)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(29,0)" id="g32"><path id="path34" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -7,0 -6,17 0,17 0,0 Z"/></g><g transform="translate(31.541,20.5566)" id="g36"><path id="path38" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.143,0.693 -0.822,1.139 -1.517,0.997 l -2.674,-0.554 -2.35,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 0,-1 5,0 c 1.079,0 1.953,0.857 1.992,1.927 l 0.355,0.073 0.653,0 c 0,0.075 -0.028,0.144 -0.045,0.217 C -0.142,-1.065 0.112,-0.541 0,0"/></g><g transform="translate(36,20)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.552 -0.447,1 -1,1 l -6,-1 -5,0 c -0.553,0 -1,-0.448 -1,-1 l 0,-2 2,0 4,0 6,2 c 0,0 1,0.447 1,1"/></g><g transform="translate(4,30.0625)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11.063 c 0,-4.97 4.029,-8.999 9,-8.999 4.971,0 9,4.029 9,8.999 L 18,-0.312 0,0 Z"/></g><g transform="translate(9,14)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,0 8,0 C 8,0 7,-2 4,-2 1,-2 0,0 0,0"/></g><g transform="translate(9,20)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -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.448 0.552,0 0,0"/></g><g transform="translate(17,20)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -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.448 0.552,0 0,0"/></g><g transform="translate(14,16.5)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(5.8472,22.2848)" id="g64"><path id="path66" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.801,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.801,2.861 0,1.58 0,0"/></g><g transform="translate(23.7292,22.2848)" id="g68"><path id="path70" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.8,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.8,2.861 0,1.58 0,0"/></g><g transform="translate(13,35.1772)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.019,0 -10.139,-4.684 -10.139,-8.588 0,-3.903 1.343,-4.986 1.56,-3.903 0.78,3.903 3.119,5.102 3.119,5.102 4.68,-3.904 3.9,-0.781 3.9,-0.781 4.68,-4.684 2.34,0 2.34,0 1.56,-1.562 6.239,-1.562 6.239,-1.562 0,0 0.78,-1.198 1.56,-2.759 0.78,-1.561 1.56,0 1.56,3.903 C 10.139,-4.684 6.239,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M22 27H4c-2.209 0-4 1.791-4 4v5h26v-5c0-2.209-1.791-4-4-4z"/><path fill="#2A6797" d="M21 32h1v4h-1zM4 32h1v4H4z"/><path fill="#F7DECE" d="M10 22v6c0 1.657 1.343 3 3 3s3-1.343 3-3v-6h-6z"/><path fill="#4289C1" d="M29 36h-7l1-17h6z"/><path fill="#EEC2AD" d="M31.541 15.443c-.144-.693-.822-1.139-1.517-.997L27.35 15H25c-1.104 0-2 .896-2 2v2h5c1.079 0 1.953-.857 1.992-1.927l.355-.073H31c0-.074-.028-.144-.045-.216.444-.276.698-.799.586-1.341z"/><path fill="#F7DECE" d="M36 16c0-.552-.447-1-1-1l-6 1h-5c-.553 0-1 .448-1 1v2h6l6-2s1-.447 1-1zM4 5.938V17c0 4.971 4.029 9 9 9s9-4.029 9-9V6.25L4 5.938z"/><path fill="#C1694F" d="M9 22h8s-1 2-4 2-4-2-4-2z"/><path fill="#662113" d="M9 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/><path fill="#C1694F" d="M14 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#F7DECE" d="M5.847 13.715c0 1.58-.801 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.801-2.861 1.788-2.861s1.788 1.281 1.788 2.861zm17.882 0c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.8-2.861 1.788-2.861s1.788 1.281 1.788 2.861z"/><path fill="#292F33" d="M13 .823C5.981.823 2.861 5.507 2.861 9.411c0 3.903 1.343 4.986 1.56 3.903.78-3.903 3.12-5.101 3.12-5.101 4.68 3.904 3.9.781 3.9.781 4.679 4.684 2.34 0 2.34 0 1.56 1.562 6.239 1.562 6.239 1.562s.78 1.198 1.559 2.759c.78 1.562 1.56 0 1.56-3.903 0-3.905-3.9-8.589-10.139-8.589z"/></svg> \ No newline at end of file |