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/1f1f5-1f1f9.svg b/public/emoji/1f1f5-1f1f9.svg
index 81defcf3a..78b29a89f 100644
--- a/public/emoji/1f1f5-1f1f9.svg
+++ b/public/emoji/1f1f5-1f1f9.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(36,9)" id="g20"><path id="path22" style="fill:#006600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -17,0 0,-26 17,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(20.2865,13.4205)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.933,2.933 -3.64,2.226 -3.169,1.755 -3.564,1.163 l 2.376,-1.584 -3.098,0 0,11.921 c 1.32,-0.189 2.523,-0.741 3.498,-1.561 l -2.657,-0.885 0.317,-0.949 3,1 -0.103,0.308 C -0.064,9.239 0.092,9.056 0.24,8.865 L -2.564,6.995 -2.286,6.58 -2.51,6.132 0.595,4.58 -2.51,3.027 -2.063,2.132 1.685,4.006 C 1.56,2.479 0.947,1.092 0,0 m -6.286,-2.341 c -0.938,0.135 -1.814,0.453 -2.593,0.92 l 2.593,0 0,-0.92 z m -5.972,6.347 3.748,-1.874 0.447,0.895 -3.105,1.553 2.116,1.058 1.412,-1.412 0.707,0.707 -1.176,1.176 0.046,0.023 -0.447,0.895 -0.345,-0.172 -0.975,0.975 1.462,-0.244 0.164,0.987 -2.514,0.419 c 1.084,1.333 2.65,2.252 4.432,2.508 l 0,-11.921 -3.099,0 2.376,1.584 -0.555,0.832 -3,-2 0.014,-0.02 c -0.96,1.096 -1.582,2.491 -1.708,4.031 m 0,1.147 c 0.084,1.022 0.383,1.982 0.858,2.833 l 1.603,-1.603 -2.461,-1.23 z m 7.972,-6.574 2.592,0 c -0.779,-0.467 -1.655,-0.785 -2.592,-0.92 l 0,0.92 z m 2.994,8.062 2.089,1.393 C 1.288,7.171 1.6,6.195 1.685,5.153 l -2.977,1.488 z m -3.994,5.938 c -4.419,0 -8,-3.581 -8,-8 0,-4.418 3.581,-8 8,-8 4.418,0 8,3.582 8,8 0,4.419 -3.582,8 -8,8"/></g><g transform="translate(11,23)" id="g32"><path id="path34" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-7 c 0,-2.209 1.791,-4 4,-4 2.209,0 4,1.791 4,4 L 8,0 0,0 Z"/></g><g transform="translate(12,22)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.656 1.343,-3 3,-3 1.657,0 3,1.344 3,3 L 6,0 0,0 Z"/></g><path id="path40" style="fill:#829acd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,17 -4,0 0,2 4,0 0,-2 z"/><path id="path42" style="fill:#829acd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,16 -2,0 0,4 2,0 0,-4 z"/><path id="path44" style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13,17 -1,0 0,2 1,0 0,-2 z"/><path id="path46" style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,17 -2,0 0,2 2,0 0,-2 z"/><path id="path48" style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,17 -1,0 0,2 1,0 0,-2 z"/><path id="path50" style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,14 -2,0 0,2 2,0 0,-2 z"/><path id="path52" style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,22 -2,0 0,-2 2,0 0,2 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#060" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#D52B1E" d="M32 5H15v26h17c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#FFCC4D" d="M15 10c-4.418 0-8 3.582-8 8s3.582 8 8 8 8-3.582 8-8-3.582-8-8-8zm3.994 5.938l2.089-1.393c.491.863.803 1.839.888 2.881l-2.977-1.488zM16 24h2.592c-.779.467-1.655.786-2.592.92V24zm-7.971-6.574c.083-1.022.383-1.982.858-2.832l1.602 1.602-2.46 1.23zm0 1.147l3.747 1.874.447-.895L9.118 18l2.116-1.058 1.412 1.412.707-.707-1.176-1.176.046-.023-.447-.895-.344.172-.975-.975 1.461.244.164-.986-2.514-.419c1.084-1.333 2.65-2.253 4.432-2.508V23h-3.099l2.376-1.584-.555-.832-3 2 .014.021c-.959-1.097-1.582-2.492-1.707-4.032zM14 24.92c-.937-.135-1.813-.453-2.592-.92H14v.92zm6.287-2.34l-2.933-2.933-.707.707.471.471-.395.592L19.099 23H16V11.08c1.321.189 2.524.741 3.499 1.561l-2.657.886.316.948 3-1-.103-.308c.167.174.323.357.471.548l-2.804 1.869L18 16l-.224.447L20.882 18l-3.105 1.553.447.895 3.747-1.874c-.124 1.527-.737 2.913-1.684 4.006z"/><path fill="#D52B1E" d="M11 13v7c0 2.209 1.791 4 4 4s4-1.791 4-4v-7h-8z"/><path fill="#FFF" d="M12 14v6c0 1.656 1.343 3 3 3s3-1.344 3-3v-6h-6z"/><path fill="#829ACD" d="M13 17h4v2h-4z"/><path fill="#829ACD" d="M14 16h2v4h-2z"/><path fill="#039" d="M12 17h1v2h-1zm2 0h2v2h-2zm3 0h1v2h-1zm-3 3h2v2h-2zm0-6h2v2h-2z"/></svg>
\ No newline at end of file