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/1f631.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/1f631.svg')
-rw-r--r-- | public/emoji/1f631.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f631.svg b/public/emoji/1f631.svg index cd901c7c1..c70a81a7e 100644 --- a/public/emoji/1f631.svg +++ b/public/emoji/1f631.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(18,36)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.94,0 -18,-8.06 -18,-18 0,-6.051 2.996,-11.392 7.574,-14.655 0.104,6.438 -2.237,13.655 -6.17,13.655 -0.464,0 -0.84,-0.066 -1.153,-0.183 0.303,0.757 0.96,1.182 2.189,1.182 4.27,0 6.666,-8.506 6.093,-15.287 C -6.714,-34.997 -3.478,-36 0,-36 c 3.479,0 6.716,1.004 9.47,2.713 -0.577,6.807 1.818,15.287 6.091,15.287 1.233,0 1.891,-0.426 2.192,-1.183 -0.314,0.117 -0.691,0.183 -1.157,0.183 -3.938,0 -6.279,-7.199 -6.17,-13.655 C 15.005,-29.392 18,-24.051 18,-18 18,-8.06 9.941,0 0,0"/></g><g transform="translate(18,36)" id="g24"><path id="path26" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.94,0 -18,-8.06 -18,-18 0,-1.192 0.123,-2.356 0.344,-3.484 0.234,0.863 0.6,1.691 1.058,2.484 -0.463,0 -0.838,-0.066 -1.151,-0.183 0.264,0.66 0.823,1.048 1.769,1.142 2.992,4.179 9.017,7.041 15.98,7.041 6.964,0 12.988,-2.861 15.98,-7.04 0.951,-0.094 1.51,-0.482 1.773,-1.143 -0.313,0.117 -0.689,0.183 -1.154,0.183 0.458,-0.793 0.823,-1.621 1.057,-2.484 C 17.878,-20.356 18,-19.192 18,-18 18,-8.06 9.941,0 0,0"/></g><g transform="translate(7.3472,24.0898)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.946,-3.176 0.107,-6.293 2.353,-6.962 4.599,-7.632 7.187,-5.6 8.132,-2.424 9.078,0.751 8.025,3.869 5.781,4.538 3.535,5.207 0.947,3.175 0,0"/></g><g transform="translate(28.6523,24.0898)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.946,-3.176 -0.107,-6.293 -2.352,-6.962 -2.247,-0.67 -4.834,1.362 -5.78,4.538 -0.946,3.175 0.107,6.293 2.351,6.962 C -3.535,5.207 -0.947,3.175 0,0"/></g><g transform="translate(18,18)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.757,0 -5,-2.243 -5,-5 l 0,-6 c 0,-2.757 2.243,-5 5,-5 2.757,0 5,2.243 5,5 l 0,6 C 5,-2.243 2.757,0 0,0"/></g><g transform="translate(1.4043,17)" id="g40"><path id="path42" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.464,0 -0.84,-0.066 -1.153,-0.183 0.072,0.179 0.167,0.336 0.281,0.477 C -2.734,-1.998 1.444,-9.54 -0.586,-17 l 6.461,0 C 7.063,-10.04 4.639,0 0,0"/></g><g transform="translate(35.7529,16.8174)" id="g44"><path id="path46" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.313,0.116 -0.69,0.183 -1.157,0.183 -4.641,0 -7.066,-10.002 -5.873,-17 l 6.46,0 C -2.476,-9.772 1.086,-2.729 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M18 0C8.06 0 0 8.06 0 18c0 6.051 2.996 11.392 7.574 14.655C7.678 26.217 5.337 19 1.404 19c-.464 0-.84.066-1.153.183C.554 18.426 1.211 18 2.44 18c4.27 0 6.666 8.506 6.092 15.288C11.286 34.997 14.522 36 18 36c3.479 0 6.716-1.004 9.47-2.713C26.893 26.48 29.288 18 33.561 18c1.233 0 1.892.426 2.192 1.183-.314-.117-.691-.183-1.157-.183-3.938 0-6.278 7.199-6.17 13.655C33.005 29.392 36 24.051 36 18c0-9.94-8.059-18-18-18z"/><path fill="#BDDDF4" d="M18 0C8.06 0 0 8.06 0 18c0 1.192.123 2.356.344 3.484.234-.863.6-1.691 1.058-2.484-.463 0-.838.066-1.15.183.264-.659.822-1.048 1.768-1.142C5.012 13.862 11.037 11 18 11c6.964 0 12.988 2.861 15.98 7.04.95.094 1.51.482 1.772 1.143-.312-.117-.689-.183-1.153-.183.458.793.823 1.621 1.058 2.484.221-1.128.343-2.292.343-3.484 0-9.94-8.059-18-18-18z"/><path fill="#F5F8FA" d="M7.347 11.91c-.946 3.176.107 6.293 2.353 6.962 2.246.67 4.834-1.362 5.779-4.538.946-3.175-.106-6.293-2.351-6.962-2.246-.669-4.834 1.363-5.781 4.538zm21.305 0c.946 3.176-.107 6.293-2.352 6.962-2.246.67-4.834-1.362-5.779-4.538-.946-3.175.107-6.293 2.351-6.962 2.245-.669 4.833 1.363 5.78 4.538z"/><path fill="#664500" d="M18 18c-2.757 0-5 2.243-5 5v6c0 2.757 2.243 5 5 5s5-2.243 5-5v-6c0-2.757-2.243-5-5-5z"/><path fill="#FCAB40" d="M1.404 19c-.464 0-.84.066-1.153.183.072-.179.167-.336.281-.476C-1.33 20.998 2.849 28.54.818 36h6.46c1.19-6.96-1.235-17-5.874-17zm34.349.183c-.314-.117-.691-.183-1.157-.183-4.641 0-7.065 10.002-5.873 17h6.46c-1.906-7.045 1.656-14.089.57-16.817z"/></svg> \ No newline at end of file |