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/1f3b4.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/1f3b4.svg')
| -rw-r--r-- | public/emoji/1f3b4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3b4.svg b/public/emoji/1f3b4.svg index e0dcba142..33d3e0f5b 100644 --- a/public/emoji/1f3b4.svg +++ b/public/emoji/1f3b4.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 8,36 C 5.791,36 4,34.209 4,32 L 4,32 4,4 C 4,1.791 5.791,0 8,0 l 0,0 20,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -20,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" 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(32,4)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -20,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 20,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(32,8)" id="g32"><path id="path34" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.117,2.744 -21.139,8.233 -28,0 -9.502,-11.402 -5.982,-4.879 -1.866,-8.996 4.117,-4.116 16.467,-6.861 21.955,-5.488 5.489,1.372 10.978,-0.972 10.978,2.63 C 3.067,-8.252 0,0 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(22.8545,23.5061)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.185 -3.393,7.578 -7.579,7.578 -4.185,0 -7.577,-3.393 -7.577,-7.578 0,-4.185 3.392,-7.579 7.577,-7.579 C -3.393,-7.579 0,-4.185 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M32 28H4V4c0-2.209 1.791-4 4-4h20c2.209 0 4 1.791 4 4v24z"/><path d="M8 36h20c2.209 0 4-1.791 4-4v-4c-4.117-2.744-21.139-8.233-28 0v4c0 2.209 1.791 4 4 4z"/><circle fill="#FFF" cx="15.276" cy="12.495" r="7.578"/></svg> \ No newline at end of file |
