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.

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f405.svg b/public/emoji/1f405.svg
index 383ee31f8..c74ecf6f5 100644
--- a/public/emoji/1f405.svg
+++ b/public/emoji/1f405.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="clipPath36" clipPathUnits="userSpaceOnUse"><path id="path38" d="M 7,22 C 4,22 0,17.625 0,15.625 l 0,0 C 0,13.625 2,12 2,12 l 0,0 c 0,0 2.171,1 5,1 l 0,0 3,0 1,-10 C 11,3 10,2 9,2 L 9,2 C 8,2 8,0 8,0 l 0,0 6,0 1,8 3,0 c 2,0 6,1 6,1 l 0,0 C 26,6 28,5 28,5 L 28,5 28,3 26,2 C 24,1 25,0 25,0 l 0,0 6,0 c 0,0 1,8 2,13 l 0,0 c 1,5 0,6 -2,7 l 0,0 c -2,1 -5,0 -9,0 l 0,0 c -2,0 -3.901,3 -9,3 l 0,0 c -1,0 -3,-1 -6,-1"/></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(32.3379,19.1479)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.367,0.33 -0.818,0.592 -1.338,0.852 -2,1 -5,0 -9,0 -2,0 -3.901,3 -9,3 -0.801,0 -2.256,-0.635 -4.341,-0.89 -0.039,1.053 -0.614,1.89 -1.326,1.89 -0.736,0 -1.333,-0.895 -1.333,-2 0,-0.051 0.007,-0.099 0.01,-0.15 -2.819,-0.766 -6.01,-4.439 -6.01,-6.225 0,-2 2,-3.625 2,-3.625 0,0 2.171,1 5,1 l 3,0 1,-10 c 0,0 -1,-1 -2,-1 -1,0 -1,-2 -1,-2 l 6,0 1,8 3,0 c 2,0 6,1 6,1 2,-3 4,-4 4,-4 l 0,-2 -2,-1 c -2,-1 -1,-2 -1,-2 l 6,0 c 0,0 1,8 2,13 0.233,1.162 0.353,2.101 0.382,2.881 0.396,-0.549 0.618,-1.183 0.618,-1.881 0,-2.93 0,-5.697 -1.832,-8.445 -0.307,-0.46 -0.183,-1.08 0.277,-1.387 0.171,-0.113 0.364,-0.168 0.554,-0.168 0.323,0 0.641,0.156 0.833,0.445 2.168,3.252 2.168,6.456 2.168,9.555 C 3.662,-2.851 2.267,-1.011 0,0"/></g><g transform="translate(6,19)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(0,16)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,-2 1,-2 1,0 2,0 2,0 2,0 1,1 0,0"/></g></g></g><g id="g32"><g clip-path="url(#clipPath36)" id="g34"><g transform="translate(16,23)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,-6 0,-12 3,-8 3,0 3,0 3,0 1,1 0,0"/></g><g transform="translate(19,22)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,-4 1,-9 3,-6 3,0 3,0 3,0 1,1 0,0"/></g><g transform="translate(22,23)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,-4 1,-9 3,-6 3,0 3,0 3,0 1,1 0,0"/></g><g transform="translate(25,24)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,-4 1,-9 3,-6 3,0 3,0 3,0 1,1 0,0"/></g><g transform="translate(28,21.5557)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,-4 1,-9 3,-6 3,0 3,0 3,0 1,1 0,0"/></g><g transform="translate(12,24)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2,-4 1,-9 3,-6 3,0 3,0 3,0 1,1 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M32.338 16.852c-.367-.33-.818-.592-1.338-.852-2-1-5 0-9 0-2 0-3.901-3-9-3-.801 0-2.256.635-4.341.89C8.62 12.837 8.044 12 7.333 12 6.597 12 6 12.895 6 14c0 .051.007.1.01.15C3.19 14.916 0 18.589 0 20.375 0 22.375 2 24 2 24s2.171-1 5-1h3l1 10s-1 1-2 1-1 2-1 2h6l1-8h3c2 0 6-1 6-1 2 3 4 4 4 4v2l-2 1c-2 1-1 2-1 2h6s1-8 2-13c.232-1.162.353-2.101.382-2.881.396.549.618 1.183.618 1.881 0 2.93 0 5.697-1.832 8.445-.307.46-.183 1.08.277 1.387.171.113.364.168.554.168.323 0 .641-.156.833-.445C36 28.303 36 25.099 36 22c0-2.297-1.396-4.137-3.662-5.148z"/><circle fill="#292F33" cx="5" cy="17" r="1"/><path fill="#292F33" d="M0 20s0 2 1 2c0-2 1-2 1-2s-1-1-2 0zm16 5c2.154-2.872 2.759-7.794 2.93-10.348-.779-.443-1.685-.901-2.804-1.223.403 1.455 1.562 6.506-.126 11.571zm4-2c1.264-1.896 1.729-4.988 1.9-7.009-.783-.039-1.562-.518-2.529-1.085.524 1.452 1.345 4.512.629 8.094zm3-1c1.094-1.641 1.588-4.177 1.812-6.141-.59.053-1.218.09-1.864.114.331 1.592.518 3.698.052 6.027zm3-1c.961-1.442 1.458-3.574 1.717-5.403-.515.033-1.052.08-1.63.138.232 1.478.308 3.291-.087 5.265zm3 2.444c1.364-2.046 1.797-5.486 1.935-7.468-.707-.336-1.538-.432-2.489-.414.523 1.528 1.236 4.471.554 7.882zM13 21c1.455-2.182 1.85-5.942 1.958-7.835C14.36 13.063 13.714 13 13 13c-.161 0-.356.032-.568.075.523 1.516 1.256 4.483.568 7.925z"/></svg>
\ No newline at end of file