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/1f35e.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/1f35e.svg')
| -rw-r--r-- | public/emoji/1f35e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f35e.svg b/public/emoji/1f35e.svg index 1df731d9d..7d2af4e75 100644 --- a/public/emoji/1f35e.svg +++ b/public/emoji/1f35e.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(36,22.5)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.558 -4.435,8.267 -10,8.479 l 0,0.021 -16,0 0,-0.021 C -31.565,8.267 -36,4.558 -36,0 c 0,-1.861 0.747,-3.576 2,-4.976 l 0,-12.524 c 0,-2.209 1.791,-4 4,-4 l 24,0 c 2.209,0 4,1.791 4,4 l 0,12.524 c 1.253,1.4 2,3.115 2,4.976"/></g><path id="path24" style="fill:#cc927a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,16.024 -15,0 0,1.5 15,0 0,-1.5 z"/><g transform="translate(21,22.5)" id="g26"><path id="path28" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3.461 -3.538,6.291 -8,6.489 -8.165,6.496 -10.332,6.5 -10.5,6.5 -15.194,6.5 -19,3.59 -19,0 c 0,-1.595 0.754,-3.053 2,-4.184 l 0,-12.316 c 0,-1.657 1.343,-3 3,-3 l 9,0 c 1.657,0 3,1.343 3,3 l 0,12.321 C -0.756,-3.048 0,-1.593 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M36 13.5c0-4.558-4.435-8.267-10-8.479V5H10v.021C4.435 5.233 0 8.942 0 13.5c0 1.861.747 3.576 2 4.976V31c0 2.209 1.791 4 4 4h24c2.209 0 4-1.791 4-4V18.476c1.253-1.4 2-3.115 2-4.976z"/><path fill="#CC927A" d="M19 18.476h15v1.5H19z"/><path fill="#FFE8B6" d="M21 13.5c0-3.461-3.538-6.291-8-6.489C12.835 7.004 10.668 7 10.5 7 5.806 7 2 9.91 2 13.5c0 1.595.754 3.053 2 4.184V30c0 1.657 1.343 3 3 3h9c1.657 0 3-1.343 3-3V17.679c1.244-1.131 2-2.586 2-4.179z"/></svg> \ No newline at end of file |
