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/1f91a-1f3fc.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/1f91a-1f3fc.svg')
| -rw-r--r-- | public/emoji/1f91a-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f91a-1f3fc.svg b/public/emoji/1f91a-1f3fc.svg index beb8fc5d7..ccc982e57 100644 --- a/public/emoji/1f91a-1f3fc.svg +++ b/public/emoji/1f91a-1f3fc.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(26,31.0352)" id="g20"><path id="path22" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.361 -1.104,2.465 -2.465,2.465 l -0.07,0 C -3.896,2.465 -5,1.361 -5,0 l 0,2.16 c 0,1.273 -1.032,2.305 -2.305,2.305 l -0.39,0 C -8.968,4.465 -10,3.433 -10,2.16 l 0,-1.195 c 0,1.381 -1.119,2.5 -2.5,2.5 -1.381,0 -2.5,-1.119 -2.5,-2.5 l 0,-9.347 c 0,1.02 -0.827,1.847 -1.846,1.847 l -0.308,0 c -1.019,0 -1.846,-0.827 -1.846,-1.847 l 0,-9.806 c 0,-1.02 0.827,-1.847 1.846,-1.847 l 0.154,0 0,-1 2.15,0 c 0.696,-3.424 3.722,-6 7.35,-6 4.143,0 7.5,3.357 7.5,7.5 l 0,6 c 0,0.217 -0.015,0.431 -0.032,0.643 C -0.019,-12.786 0,-12.681 0,-12.57 L 0,0 Z"/></g><g transform="translate(30,28)" id="g24"><path id="path26" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,2 -2,2 -4,2 -4,0 -4,0 l 0,-9.286 c -0.319,0.147 -0.651,0.281 -1,0.398 L -5,4 c 0,0 0,2 -2,2 -2,0 -2,-2 -2,-2 l 0,-12.122 c -0.328,0.028 -0.661,0.052 -1,0.069 L -10,6 c 0,0 0,2 -2,2 -2,0 -2,-2 -2,-2 l 0,-14.052 c -0.342,-0.017 -0.669,-0.052 -1,-0.081 L -15,5 c 0,0 0,2 -2,2 -2,0 -2,-2 -2,-2 l 0,-18 -1,0 0,8 c 0,0 0,2 -2,2 -2,0 -2,-2 -2,-2 l 0,-11 c 0,-6.627 5.373,-12 12,-12 6.627,0 12,5.373 12,12 l 0,1 0,15 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D2A077" d="M26 4.965C26 3.604 24.896 2.5 23.535 2.5h-.07C22.104 2.5 21 3.604 21 4.965v-2.16C21 1.532 19.968.5 18.695.5h-.391C17.032.5 16 1.532 16 2.805V4c0-1.381-1.119-2.5-2.5-2.5S11 2.619 11 4v9.347c0-1.02-.827-1.847-1.846-1.847h-.308C7.827 11.5 7 12.327 7 13.347v9.807C7 24.173 7.827 25 8.846 25H9v1h2.15c.695 3.424 3.721 6 7.35 6 4.143 0 7.5-3.357 7.5-7.5v-6c0-.217-.015-.431-.032-.643.013-.107.032-.211.032-.322V4.965z"/><path fill="#F3D2A2" d="M30 8s0-2-2-2-2 2-2 2v9.286c-.319-.147-.651-.281-1-.398V4s0-2-2-2-2 2-2 2v12.122c-.328-.028-.661-.052-1-.069V2s0-2-2-2-2 2-2 2v14.052c-.342.017-.668.053-1 .082V3s0-2-2-2-2 2-2 2v18h-1v-8s0-2-2-2-2 2-2 2v11c0 6.627 5.373 12 12 12s12-5.373 12-12V8z"/></svg> \ No newline at end of file |
