about summary refs log tree commit diff
path: root/public/emoji/1f46f-200d-2642-fe0f.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 07:05:29 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-09 07:13:59 +0200
commitd392020da6ff4511a2925b327de23933f374bea3 (patch)
treee86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f46f-200d-2642-fe0f.svg
parentc699b2d141d7aa910bd81ae5fe881ecec7039395 (diff)
parent1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (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/1f46f-200d-2642-fe0f.svg')
-rw-r--r--public/emoji/1f46f-200d-2642-fe0f.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f46f-200d-2642-fe0f.svg b/public/emoji/1f46f-200d-2642-fe0f.svg
index d58f55fae..db3d12a26 100644
--- a/public/emoji/1f46f-200d-2642-fe0f.svg
+++ b/public/emoji/1f46f-200d-2642-fe0f.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(10.4999,33)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.187,0 -2.282,-0.379 -3.181,-1.018 -5.027,-1.114 -6.5,-2.629 -6.5,-4.5 c 0,-1.542 0.007,-3.484 2.038,-4.208 C -3.464,-10.094 -1.84,-11 0,-11 3.037,-11 5.5,-8.538 5.5,-5.501 5.5,-2.463 3.037,0 0,0"/></g><g transform="translate(7.9999,1)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 1,9.712 3,0 L 0,0 Z"/></g><g transform="translate(13.8754,2.208)" id="g28"><path id="path30" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.834,1.333 c 0,0 3.167,3.012 2.532,3.994 -0.637,0.982 -3.782,1.688 -3.782,1.688 l 1.918,2.306 c 0,0 3.957,-1.904 4.77,-3.333 C 4.43,4.537 0,0 0,0"/></g><g transform="translate(3.9999,0)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(14.5531,0.5166)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.421,0.908 c 0,0 0.419,0.907 -1.396,1.747 C -2.788,3.496 -3.208,2.589 -3.208,2.589 L -3.628,1.682 0,0 Z"/></g><g transform="translate(4.9999,9.7119)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -3,3 c -0.36,0.36 -0.392,0.934 -0.074,1.332 l 4,3.288 C 0.564,8.345 1.194,8.414 1.625,8.069 2.056,7.724 2.126,7.095 1.781,6.663 L -1.66,4.074 0.707,1.707 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(14.9999,9.7119)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 L 1.66,4.074 -1.781,6.663 c -0.345,0.432 -0.275,1.061 0.157,1.406 0.43,0.345 1.06,0.276 1.405,-0.156 l 4,-3.288 C 4.1,4.227 4.067,3.653 3.707,3.293 l -3,-3 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(15.9999,17)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 l -2,0 -4,0 -2,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 2,0 0,-5.288 3,-2 2,0 3,2 0,5.288 2,0 0,1 z"/></g><g transform="translate(23.9999,1)" id="g52"><path id="path54" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 1,9.712 3,0 L 0,0 Z"/></g><g transform="translate(29.8749,2.208)" id="g56"><path id="path58" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.833,1.333 c 0,0 3.167,3.012 2.531,3.994 -0.636,0.982 -3.782,1.688 -3.782,1.688 l 1.918,2.306 c 0,0 3.958,-1.904 4.77,-3.333 C 4.43,4.537 0,0 0,0"/></g><g transform="translate(30.5526,0.5166)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.422,0.908 c 0,0 0.418,0.907 -1.397,1.747 C -2.787,3.496 -3.207,2.589 -3.207,2.589 L -3.627,1.682 0,0 Z"/></g><g transform="translate(19.9999,0)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(20.9999,9.7119)" id="g68"><path id="path70" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -3,3 c -0.36,0.36 -0.392,0.934 -0.074,1.332 l 4,3.288 C 0.564,8.345 1.194,8.414 1.625,8.069 2.057,7.724 2.126,7.095 1.781,6.663 L -1.66,4.074 0.707,1.707 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(30.9999,9.7119)" id="g72"><path id="path74" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 L 1.66,4.074 -1.781,6.663 c -0.345,0.432 -0.276,1.061 0.156,1.406 0.431,0.345 1.061,0.276 1.406,-0.156 l 4,-3.288 C 4.1,4.227 4.067,3.653 3.707,3.293 l -3,-3 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(27.9999,19)" id="g76"><path id="path78" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-1 c 0,0 0,-3 3,-3 3,0 3,3 3,3 L 1,0 0,0 Z"/></g><g transform="translate(29.9999,19)" id="g80"><path id="path82" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -4,0 -2,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-1 2,0 0,-5.288 3,-2 2,0 3,2 0,5.288 2,0 0,1 C 2,-0.896 1.104,0 0,0"/></g><g transform="translate(14.8749,34.8125)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.763,0.147 -2.846,-1.201 -3.142,-2.519 -0.982,0.51 -2.456,0.544 -3.736,-0.164 -0.216,1.385 -1.319,2.901 -3.185,2.745 -0.937,-2.437 1.032,-4.249 3.001,-4.249 1.875,0.874 3.249,0.312 4.062,-0.063 1.969,0 3.937,1.812 3,4.25"/></g><g transform="translate(7.9999,21)" id="g88"><path id="path90" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 c 0,-1.105 0.895,-2 2,-2 1.104,0 2,0.895 2,2 L 4,0 0,0 Z"/></g><g transform="translate(25,9)" id="g92"><path id="path94" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.344,-3.219 -3.656,-2.875 -3,1.712 0,0 Z"/></g><g transform="translate(9,9)" id="g96"><path id="path98" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.344,-3.219 -3.656,-2.875 -3,1.712 0,0 Z"/></g><g transform="translate(13.134,11.3814)" id="g100"><path id="path102" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.631,-1.326 1.275,-4.036 -2.134,-2.669 0,0 Z"/></g><g transform="translate(29.134,11.3814)" id="g104"><path id="path106" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.631,-1.326 1.275,-4.036 -2.134,-2.669 0,0 Z"/></g><g transform="translate(11.9999,22)" id="g108"><path id="path110" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(14.9999,30)" id="g112"><path id="path114" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 0,-6 0,-0.001 c 0,-2.762 2.238,-4.999 5,-4.999 2.762,0 5,2.237 5,4.999 L 0,-6 0,0 Z"/></g><g transform="translate(7.9999,30)" id="g116"><path id="path118" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,-4 c 2.333,0 2.85,2.412 2.965,3.488 C 0.004,-1.588 0.779,-4 7,-4 L 7,0 0,0 Z"/></g><g transform="translate(7.9999,24.5)" id="g120"><path id="path122" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(12.9999,24.5)" id="g124"><path id="path126" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(8.9999,23)" id="g128"><path id="path130" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 1.999,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(11.9999,21)" id="g132"><path id="path134" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(24,21)" id="g136"><path id="path138" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 c 0,-1.105 0.896,-2 2,-2 1.105,0 2,0.895 2,2 L 4,0 0,0 Z"/></g><g transform="translate(28,22)" id="g140"><path id="path142" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(26.4999,33)" id="g144"><path id="path146" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.187,0 -2.282,-0.379 -3.181,-1.018 -5.027,-1.114 -6.5,-2.629 -6.5,-4.5 c 0,-1.542 0.007,-3.484 2.038,-4.208 C -3.464,-10.094 -1.84,-11 0,-11 3.037,-11 5.5,-8.538 5.5,-5.501 5.5,-2.463 3.037,0 0,0"/></g><g transform="translate(30.9999,30)" id="g148"><path id="path150" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 0,-6 0,-0.001 c 0,-2.762 2.238,-4.999 5,-4.999 2.762,0 5,2.237 5,4.999 L 0,-6 0,0 Z"/></g><g transform="translate(30.8749,34.8125)" id="g152"><path id="path154" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.763,0.147 -2.846,-1.201 -3.142,-2.519 -0.982,0.51 -2.456,0.544 -3.736,-0.164 -0.216,1.385 -1.319,2.901 -3.185,2.745 -0.937,-2.437 1.032,-4.249 3.001,-4.249 1.875,0.874 3.249,0.312 4.062,-0.063 1.969,0 3.937,1.812 3,4.25"/></g><g transform="translate(23.9999,30)" id="g156"><path id="path158" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,-4 c 2.333,0 2.85,2.412 2.965,3.488 C 0.004,-1.588 0.779,-4 7,-4 L 7,0 0,0 Z"/></g><g transform="translate(23.9999,24.5)" id="g160"><path id="path162" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(28.9999,24.5)" id="g164"><path id="path166" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(24.9999,23)" id="g168"><path id="path170" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 2,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(27.9999,21)" id="g172"><path id="path174" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M8 35H5l1-9.712h3zm5.875-1.208l-1.834-1.333s3.167-3.012 2.531-3.994c-.636-.981-3.782-1.688-3.782-1.688l1.918-2.307s3.958 1.904 4.77 3.333c.827 1.452-3.603 5.989-3.603 5.989z"/><path fill="#292F33" d="M4 36v-1s0-1 2-1 2 1 2 1v1H4zm10.553-.517l.421-.908s.419-.907-1.396-1.747c-1.813-.841-2.233.066-2.233.066l-.42.907 3.628 1.682z"/><path fill="#FFDC5D" d="M5 26.288c-.256 0-.512-.098-.707-.293l-3-3c-.36-.36-.392-.934-.074-1.332l4-3.288c.345-.432.975-.501 1.405-.156.432.345.501.974.156 1.406l-3.44 2.589 2.367 2.367c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293zm10 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l2.367-2.367-3.441-2.589c-.345-.432-.275-1.06.156-1.406.43-.345 1.06-.276 1.405.156l4.001 3.288c.318.398.286.972-.074 1.332l-3 3c-.195.195-.451.293-.707.293z"/><path fill="#292F33" d="M16 19c0-1.104-.896-2-2-2H6c-1.104 0-2 .896-2 2v1h2v5.288l3 2h2l3-2V20h2v-1z"/><path fill="#FFAC33" d="M10.5 3c-1.187 0-2.282.379-3.181 1.018C5.473 4.114 4 5.629 4 7.5c0 1.542.007 3.484 2.038 4.207C7.036 13.094 8.66 14 10.5 14c3.037 0 5.5-2.462 5.5-5.499C16 5.463 13.537 3 10.5 3z"/><path fill="#FFDC5D" d="M8 15v3c0 1.104.896 2 2 2s2-.896 2-2v-3H8z"/><path fill="#292F33" d="M9 27l-.344 3.219-3.312-.344L6 25.288zm4.134-2.381l2.631 1.325-1.356 2.711L11 27.288z"/><path fill="#F9CA55" d="M12 14l-4 .019V18s2 1 4 0v-4z"/><path fill="#FFDC5D" d="M15 6H5v6c0 2.762 2.238 5 5 5s5-2.237 5-5V6z"/><path fill="#292F33" d="M14.875 1.188c-1.763-.147-2.846 1.201-3.142 2.519-.982-.51-2.456-.545-3.736.163-.216-1.384-1.32-2.9-3.185-2.745-.938 2.438 1.031 4.25 3 4.25 1.875-.875 3.25-.312 4.062.062 1.97.001 3.938-1.812 3.001-4.249z"/><path fill="#FFAC33" d="M8 6H5v4c2.333 0 2.85-2.412 2.965-3.488C8.004 7.588 8.779 10 15 10V6H8z"/><circle fill="#662113" cx="7.5" cy="11.5" r=".5"/><circle fill="#662113" cx="12.5" cy="11.5" r=".5"/><path fill="#C1694F" d="M9 13h2s0 1-1 1-1-1-1-1zm3 2H8s0 1 2 1 2-1 2-1z"/><path fill="#FFDC5D" d="M24 35h-3l1-9.712h3zm5.875-1.208l-1.833-1.333s3.167-3.012 2.531-3.994c-.636-.981-3.782-1.688-3.782-1.688l1.918-2.307s3.958 1.904 4.77 3.333c.826 1.452-3.604 5.989-3.604 5.989z"/><path fill="#292F33" d="M30.553 35.483l.422-.908s.418-.907-1.396-1.747c-1.812-.841-2.232.066-2.232.066l-.42.907 3.626 1.682zM20 36v-1s0-1 2-1 2 1 2 1v1h-4z"/><path fill="#FFDC5D" d="M21 26.288c-.256 0-.512-.098-.707-.293l-3-3c-.36-.36-.392-.934-.074-1.332l4-3.288c.346-.432.976-.501 1.406-.156.432.345.501.974.156 1.406l-3.441 2.589 2.367 2.367c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293zm10 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l2.367-2.367-3.441-2.589c-.345-.432-.275-1.06.156-1.406.431-.345 1.06-.276 1.406.156l4 3.288c.318.398.286.972-.074 1.332l-3 3c-.195.195-.451.293-.707.293z"/><path fill="#FFDC5D" d="M28 17v-3h-4v3h-1v1s0 3 3 3 3-3 3-3v-1h-1z"/><path fill="#292F33" d="M30 17h-8c-1.104 0-2 .896-2 2v1h2v5.288l3 2h2l3-2V20h2v-1c0-1.104-.896-2-2-2z"/><path fill="#292F33" d="M25 27l-.344 3.219-3.312-.344.656-4.587zm4.134-2.381l2.631 1.325-1.356 2.711L27 27.288z"/><path fill="#FFDC5D" d="M24 15v3c0 1.104.896 2 2 2s2-.896 2-2v-3h-4z"/><path fill="#F9CA55" d="M28 14l-4 .019V18s2 1 4 0v-4z"/><path fill="#FFAC33" d="M26.5 3c-1.187 0-2.282.379-3.181 1.018C21.473 4.114 20 5.629 20 7.5c0 1.542.007 3.484 2.038 4.207C23.036 13.094 24.66 14 26.5 14c3.037 0 5.5-2.462 5.5-5.499C32 5.463 29.537 3 26.5 3z"/><path fill="#FFDC5D" d="M31 6H21v6c0 2.762 2.238 5 5 5s5-2.237 5-5V6z"/><path fill="#292F33" d="M30.875 1.188c-1.763-.147-2.846 1.201-3.142 2.519-.982-.509-2.456-.544-3.736.164-.216-1.384-1.319-2.901-3.184-2.745-.938 2.438 1.031 4.25 3 4.25 1.875-.875 3.25-.312 4.062.062 1.969 0 3.937-1.813 3-4.25z"/><path fill="#FFAC33" d="M24 6h-3v4c2.333 0 2.85-2.412 2.965-3.488C24.004 7.588 24.779 10 31 10V6h-7z"/><circle fill="#662113" cx="23.5" cy="11.5" r=".5"/><circle fill="#662113" cx="28.5" cy="11.5" r=".5"/><path fill="#C1694F" d="M25 13h2s0 1-1 1-1-1-1-1zm3 2h-4s0 1 2 1 2-1 2-1z"/></svg>
\ No newline at end of file