about summary refs log tree commit diff
path: root/public/emoji/1f38e.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/1f38e.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/1f38e.svg')
-rw-r--r--public/emoji/1f38e.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f38e.svg b/public/emoji/1f38e.svg
index beb21af5c..56b4b80ac 100644
--- a/public/emoji/1f38e.svg
+++ b/public/emoji/1f38e.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 27,17 -4,0 c -1.65,0 -4,-3.584 -4,-7 l 0,0 0,-6 c 0,-1.65 1.35,-3 3,-3 l 0,0 5,0 5,0 c 1.65,0 3,1.35 3,3 l 0,0 0,6 c 0,3.416 -2.35,7 -4,7 l 0,0 -4,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><clipPath id="clipPath52" clipPathUnits="userSpaceOnUse"><path id="path54" d="M 9,17 5,17 C 3.35,17 1,13.416 1,10 L 1,10 1,4 C 1,2.35 2.35,1 4,1 l 0,0 5,0 5,0 c 1.65,0 3,1.35 3,3 l 0,0 0,6 c 0,3.416 -2.35,7 -4,7 l 0,0 -4,0 z"/></clipPath><clipPath id="clipPath64" clipPathUnits="userSpaceOnUse"><path id="path66" 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(31,17)" id="g20"><path id="path22" style="fill:#f26522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 -4,0 c -1.65,0 -4,-3.583 -4,-7 l 0,-6 c 0,-1.65 1.35,-3 3,-3 l 5,0 5,0 c 1.65,0 3,1.35 3,3 l 0,6 C 4,-3.583 1.65,0 0,0"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(23,16)" id="g32"><path id="path34" style="fill:#d14a15;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2 -0.2,-4 3,-5 l 0,-4 c 0,-2.219 -2.267,-4 -7,-4 l 0,-2 16,0 0,2 c -4.733,0 -7,1.781 -7,4 l 0,4 c 3.2,1 3,3 3,5 L 0,0 Z"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(13,17)" id="g44"><path id="path46" style="fill:#27aae1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 -4,0 c -1.65,0 -4,-3.583 -4,-7 l 0,-6 c 0,-1.65 1.35,-3 3,-3 l 5,0 5,0 c 1.65,0 3,1.35 3,3 l 0,6 C 4,-3.583 1.65,0 0,0"/></g></g></g><g id="g48"><g clip-path="url(#clipPath52)" id="g50"><g transform="translate(5,16)" id="g56"><path id="path58" style="fill:#005792;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2 -0.2,-4 3,-5 l 0,-4 c 0,-2.219 -2.267,-4 -7,-4 l 0,-2 16,0 0,2 c -4.733,0 -7,1.781 -7,4 l 0,4 c 3.2,1 3,3 3,5 L 0,0 Z"/></g></g></g><g id="g60"><g clip-path="url(#clipPath64)" id="g62"><g transform="translate(27,14)" id="g68"><path id="path70" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.527,0 -6,-3 -6,-3 l 6,-4 6,4 C 6,-3 4.527,0 0,0"/></g><g transform="translate(35,24)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-3 -5.707,0 -7.5,0 -1.976,0 -8.5,-3 -8.5,0 l 0,6 c 0,4.418 3.582,8 8,8 4.418,0 8,-3.582 8,-8"/></g><g transform="translate(33,22)" id="g76"><path id="path78" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3 -0.406,-7 -6,-7 -5.594,0 -6,3 -6,7 3.031,0 6,2 6,2 0,0 3.031,-2 6,-2"/></g><g transform="translate(31.6034,19.6387)" id="g80"><path id="path82" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.906,0.146 -2.457,0.47 -3.318,-0.318 -0.358,-0.261 -0.098,-1.003 0.572,-0.685 0.669,0.319 2.184,0.404 2.789,0.438 C 0.649,-0.531 0.659,-0.106 0,0"/></g><g transform="translate(22.4361,19.6387)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.906,0.146 2.457,0.47 3.318,-0.318 3.676,-0.579 3.416,-1.321 2.746,-1.003 2.077,-0.684 0.562,-0.599 -0.043,-0.565 -0.649,-0.531 -0.659,-0.106 0,0"/></g><g transform="translate(32.0198,29.7414)" id="g88"><path id="path90" style="fill:#f26522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.247 -2.239,2.259 -5,2.259 -2.761,0 -5,-1.012 -5,-2.259 0,-0.61 2.88,-1.164 5,-1.57 2.12,0.406 5,0.96 5,1.57"/></g><g transform="translate(27,30)" id="g92"><path id="path94" style="fill:#d14a15;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,3 C -1,4.552 -0.553,5 0,5 0.553,5 1,4.552 1,4 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(24,30)" id="g96"><path id="path98" style="fill:#d14a15;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 -2,2 c -0.391,0.391 -0.391,1.023 0,1.414 0.391,0.391 1.023,0.391 1.414,0 l 2,-2 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,30)" id="g100"><path id="path102" style="fill:#d14a15;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 2,2 c 0.391,0.391 1.023,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 l -2,-2 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(25.5198,16.7031)" id="g104"><path id="path106" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.293 0.672,-0.531 1.5,-0.531 2.328,-0.531 3,-0.293 3,0 3,0.293 2.328,0.531 1.5,0.531 0.672,0.531 0,0.293 0,0"/></g><g transform="translate(17,23)" id="g108"><path id="path110" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 c 0,-3 -6.207,-3 -8,-3 -1.976,0 -8,0 -8,3 l 0,3 c 0,4.418 3.582,6 8,6 4.418,0 8,-1.582 8,-6"/></g><g transform="translate(3,23)" id="g112"><path id="path114" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-1 c 0,-4 0.406,-7 6,-7 5.594,0 6,4 6,7 L 12,0 0,0 Z"/></g><g transform="translate(13.6034,19.6387)" id="g116"><path id="path118" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.906,0.146 -2.457,0.47 -3.318,-0.318 -0.358,-0.261 -0.098,-1.003 0.572,-0.685 0.669,0.319 2.184,0.404 2.789,0.438 C 0.649,-0.531 0.659,-0.106 0,0"/></g><g transform="translate(4.4361,19.6387)" id="g120"><path id="path122" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.906,0.146 2.457,0.47 3.318,-0.318 3.676,-0.579 3.416,-1.321 2.746,-1.003 2.077,-0.684 0.562,-0.599 -0.043,-0.565 -0.649,-0.531 -0.659,-0.106 0,0"/></g><g transform="translate(7.5198,16.7031)" id="g124"><path id="path126" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.293 0.672,-0.531 1.5,-0.531 2.328,-0.531 3,-0.293 3,0 3,0.293 2.328,0.531 1.5,0.531 0.672,0.531 0,0.293 0,0"/></g><g transform="translate(28.5625,34)" id="g128"><path id="path130" style="fill:#d14a15;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.863 -0.7,-1.562 -1.562,-1.562 -0.863,0 -1.563,0.699 -1.563,1.562 0,0.863 0.7,1.562 1.563,1.562 C -0.7,1.562 0,0.863 0,0"/></g><g transform="translate(23.5625,33)" id="g132"><path id="path134" style="fill:#d14a15;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.863 -0.7,-1.562 -1.562,-1.562 -0.863,0 -1.563,0.699 -1.563,1.562 0,0.863 0.7,1.562 1.563,1.562 C -0.7,1.562 0,0.863 0,0"/></g><g transform="translate(33.5625,33)" id="g136"><path id="path138" style="fill:#d14a15;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.863 -0.7,-1.562 -1.562,-1.562 -0.863,0 -1.563,0.699 -1.563,1.562 0,0.863 0.7,1.562 1.563,1.562 C -0.7,1.562 0,0.863 0,0"/></g><g transform="translate(5,9)" id="g140"><path id="path142" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><g transform="translate(15,6)" id="g144"><path id="path146" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><g transform="translate(23,6)" id="g148"><path id="path150" style="fill:#ffb699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><g transform="translate(33,6)" id="g152"><path id="path154" style="fill:#ffb699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><g transform="translate(10.1815,14.1208)" id="g156"><path id="path158" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.181,0.003 -2.361,0 c -0.484,-0.001 -0.928,-0.324 -0.85,-0.98 l 1.152,-10.143 c 0.098,-0.513 0.394,-0.812 0.878,-0.81 0.484,-0.002 0.781,0.297 0.879,0.81 L 0.85,-0.98 C 0.928,-0.324 0.484,-0.001 0,0"/></g><g transform="translate(16,23.8473)" id="g160"><path id="path162" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.011 -3.134,-1.83 -7,-1.83 -3.866,0 -7,0.819 -7,1.83 0,1.011 3.134,1.83 7,1.83 3.866,0 7,-0.819 7,-1.83"/></g><g transform="translate(12.125,28.1262)" id="g164"><path id="path166" style="fill:#26aae1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.46 -6.25,-3.46 -6.25,0 0,3.46 1.399,6.874 3.125,6.874 C -1.399,6.874 0,3.46 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F26522" d="M31 19h-8c-1.65 0-4 3.583-4 7v6c0 1.65 1.35 3 3 3h10c1.65 0 3-1.35 3-3v-6c0-3.417-2.35-7-4-7z"/><path fill="#D14A15" d="M34.816 32.996C30.211 32.949 28 31.189 28 29v-4c3.2-1 3-3 3-5h-8c0 2-.2 4 3 5v4c0 2.189-2.211 3.949-6.816 3.996C19.598 34.158 20.7 35 22 35h10c1.3 0 2.402-.842 2.816-2.004z"/><circle fill="#FFB699" cx="22" cy="30" r="1"/><circle fill="#FFB699" cx="32" cy="30" r="1"/><path fill="#FFCC4D" d="M27 22c-4.527 0-6 3-6 3l6 4 6-4s-1.473-3-6-3z"/><path fill="#292F33" d="M35 12v6c0 3-5.707 0-7.5 0-1.976 0-8.5 3-8.5 0v-6c0-4.418 3.582-8 8-8s8 3.582 8 8z"/><path fill="#F5F8FA" d="M33 14c0 3-.406 7-6 7s-6-3-6-7c3.031 0 6-2 6-2s3.031 2 6 2z"/><path fill="#292F33" d="M31.603 16.361c-.906-.146-2.457-.47-3.318.318-.357.261-.098 1.003.572.685.669-.318 2.184-.403 2.789-.438.607-.033.617-.459-.043-.565zm-9.167 0c.906-.146 2.457-.47 3.318.318.357.261.098 1.003-.572.685-.669-.318-2.184-.403-2.789-.438-.606-.033-.616-.459.043-.565z"/><ellipse fill="#A0041E" cx="27.02" cy="19.297" rx="1.5" ry=".531"/><path fill="#F26522" d="M32.02 6.259c0-1.247-2.239-2.259-5-2.259s-5 1.011-5 2.259c0 .61 2.88 1.164 5 1.57 2.119-.407 5-.96 5-1.57z"/><path fill="#D14A15" d="M23.549 3.135c.004-.045.013-.089.013-.135 0-.863-.7-1.562-1.562-1.562S20.438 2.137 20.438 3s.7 1.562 1.562 1.562c.046 0 .09-.01.135-.014l1.158 1.158c.195.196.451.294.707.294s.512-.098.707-.293c.391-.391.391-1.023 0-1.414l-1.158-1.158zM27 .438c-.863 0-1.562.7-1.562 1.562 0 .48.221.905.562 1.191V5c0 .552.447 1 1 1s1-.448 1-1V3.191c.341-.286.562-.711.562-1.191 0-.863-.699-1.562-1.562-1.562zm5 1c-.863 0-1.562.7-1.562 1.562 0 .046.01.09.014.135l-1.158 1.158c-.391.391-.391 1.023 0 1.414.194.195.45.293.706.293s.512-.098.707-.293l1.158-1.158c.045.004.089.013.135.013.863 0 1.562-.7 1.562-1.562S32.863 1.438 32 1.438z"/><path fill="#27AAE1" d="M13 19H5c-1.65 0-4 3.583-4 7v6c0 1.65 1.35 3 3 3h10c1.65 0 3-1.35 3-3v-6c0-3.417-2.35-7-4-7z"/><path fill="#005792" d="M16.816 32.996C12.211 32.949 10 31.189 10 29v-4c3.2-1 3-3 3-5H5c0 2-.2 4 3 5v4c0 2.189-2.211 3.949-6.816 3.996C1.598 34.158 2.7 35 4 35h10c1.3 0 2.402-.842 2.816-2.004z"/><circle fill="#BBDDF5" cx="4" cy="27" r="1"/><circle fill="#BBDDF5" cx="14" cy="30" r="1"/><path fill="#FFCC4D" d="M10.182 21.879l-1.181-.003-1.181.003c-.484.001-.928.324-.85.98l1.152 10.143c.098.513.395.811.879.81.484.001.78-.297.879-.81l1.152-10.143c.077-.656-.366-.979-.85-.98z"/><path fill="#292F33" d="M17 13v3c0 3-6.207 3-8 3-1.976 0-8 0-8-3v-3c0-4.418 3.582-6 8-6s8 1.582 8 6z"/><path fill="#F5F8FA" d="M3 13.092V14c0 4 .406 7 6 7s6-4 6-7v-.908c-1.223.533-3.449.891-6 .891s-4.777-.358-6-.891z"/><path fill="#292F33" d="M13.603 16.361c-.906-.146-2.457-.47-3.318.318-.357.261-.098 1.003.572.685.669-.318 2.184-.403 2.789-.438.607-.033.617-.459-.043-.565zm-9.167 0c.906-.146 2.457-.47 3.318.318.357.261.098 1.003-.572.685-.669-.318-2.184-.403-2.789-.438-.606-.033-.616-.459.043-.565z"/><ellipse fill="#A0041E" cx="9.02" cy="19.297" rx="1.5" ry=".531"/><path fill="#26AAE1" d="M12.125 7.874c0 3.46-6.25 3.46-6.25 0S7.274 1 9 1s3.125 3.414 3.125 6.874z"/></svg>
\ No newline at end of file