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/1f3ac.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/1f3ac.svg')
-rw-r--r-- | public/emoji/1f3ac.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3ac.svg b/public/emoji/1f3ac.svg index 1a91c024e..3a3267661 100644 --- a/public/emoji/1f3ac.svg +++ b/public/emoji/1f3ac.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(35.8452,4)" id="g20"><path id="path22" style="fill:#3f7123;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.2 -1.8,-4 -4,-4 l -26,0 c -2.2,0 -4,1.8 -4,4 l 0,13 c 0,2.2 1.8,4 4,4 l 26,0 c 2.2,0 4,-1.8 4,-4 L 0,0 Z"/></g><path id="path24" style="fill:#3f7123;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35.845,15 -34,0 0,6 34,0 0,-6 z"/><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35.845,14 -34,0 0,7 34,0 0,-7 z"/><g transform="translate(26.8452,21)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,-7 7,0 4,7 -7,0 z m -14,0 -4,-7 7,0 4,7 -7,0 z m -11,0 4,0 -4,-7 0,7 z"/></g><g transform="translate(34.8393,29.2075)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -32.994,-8.208 -34.685,-1.415 -1.689,6.793 0,0 Z"/></g><g transform="translate(32.8989,28.7246)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5.572,5.828 -12.365,4.138 -6.793,-1.689 0,0 Z m -13.586,-3.379 -5.572,5.827 -6.793,-1.69 5.572,-5.827 6.793,1.69 z m -19.158,2.447 5.572,-5.827 -3.882,-0.966 -1.69,6.793 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3F7123" d="M35.845 32c0 2.2-1.8 4-4 4h-26c-2.2 0-4-1.8-4-4V19c0-2.2 1.8-4 4-4h26c2.2 0 4 1.8 4 4v13z"/><path fill="#3F7123" d="M1.845 15h34v6h-34z"/><path fill="#CCD6DD" d="M1.845 15h34v7h-34z"/><path fill="#292F33" d="M1.845 15h4l-4 7v-7zm11 0l-4 7h7l4-7h-7zm14 0l-4 7h7l4-7h-7z"/><path fill="#CCD6DD" d="M.155 8.207L33.148 0l1.69 6.792L1.845 15z"/><path fill="#292F33" d="M.155 8.207l5.572 5.827L1.845 15 .155 8.207zm19.158 2.448l-5.572-5.828-6.793 1.69 5.572 5.828 6.793-1.69zm13.586-3.38l-5.572-5.828-6.793 1.69 5.572 5.827 6.793-1.689z"/></svg> \ No newline at end of file |