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/1f1e8-1f1fb.svg b/public/emoji/1f1e8-1f1fb.svg
index d9055e7f3..9b2cc18df 100644
--- a/public/emoji/1f1e8-1f1fb.svg
+++ b/public/emoji/1f1e8-1f1fb.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(32,31)" id="g20"><path id="path22" style="fill:#003893;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-10 36,0 0,10 C 4,-1.791 2.209,0 0,0"/></g><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,15 36,0 0,2 -36,0 0,-2 z"/><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,10 36,0 0,2 -36,0 0,-2 z"/><g transform="translate(0,15)" id="g28"><path id="path30" style="fill:#cf2027;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 0,0 36,0 0,0 0,3 0,0 -36,0 z"/></g><g transform="translate(4,5)" id="g32"><path id="path34" style="fill:#003893;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 28,0 c 2.209,0 4,1.791 4,4 L 32,5 -4,5 -4,4 C -4,1.791 -2.209,0 0,0"/></g><g transform="translate(14.3473,20.0966)" id="g36"><path id="path38" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(20.5291,15.6052)" id="g40"><path id="path42" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(8.1654,15.6052)" id="g44"><path id="path46" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(8.1654,11.588)" id="g48"><path id="path50" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(20.5291,11.588)" id="g52"><path id="path54" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(14.1669,7.6517)" id="g56"><path id="path58" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.292,0.898 -0.584,0 -1.528,0 -0.764,-0.555 -1.056,-1.453 -0.292,-0.898 0.472,-1.453 0.18,-0.555 0.945,0 0,0 Z"/></g><g transform="translate(18.1679,8.338)" id="g60"><path id="path62" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(18.1679,18.8419)" id="g64"><path id="path66" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.764,0.555 -0.944,0 -0.292,0.898 -0.292,-0.898 -0.945,0 L -0.945,0 -1.236,-0.898 -0.472,-0.343 0.292,-0.898 0,0 Z"/></g><g transform="translate(9.5821,8.338)" id="g68"><path id="path70" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.764,0.555 0.944,0 0.292,0.898 0.292,-0.898 0.945,0 L 0.945,0 1.236,-0.898 0.472,-0.343 -0.292,-0.898 0,0 Z"/></g><g transform="translate(9.5821,18.8419)" id="g72"><path id="path74" style="fill:#f7d116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.764,0.555 0.944,0 0.292,0.898 0.292,-0.898 0.945,0 L 0.945,0 1.236,-0.898 0.472,-0.343 -0.292,-0.898 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#003893" d="M32 5H4C1.791 5 0 6.791 0 9v10h36V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M0 19h36v2H0zm0 5h36v2H0z"/><path fill="#CF2027" d="M0 21v3h36v-3H0z"/><path fill="#003893" d="M4 31h28c2.209 0 4-1.791 4-4v-1H0v1c0 2.209 1.791 4 4 4z"/><path fill="#F7D116" d="M14.347 15.903l.764-.555h-.944l-.292-.898-.292.898h-.944l.764.555-.292.899.764-.555.764.555zm6.182 4.492l.764-.555h-.944l-.292-.899-.292.899h-.945l.765.555-.292.898.764-.555.764.555zm-12.364 0l.765-.555h-.945l-.292-.899-.292.899h-.944l.764.555-.292.898.764-.555.764.555zm0 4.017l.765-.555h-.945l-.292-.898-.292.898h-.944l.764.555-.292.898.764-.555.764.555zm12.364 0l.764-.555h-.944l-.292-.898-.292.898h-.945l.765.555-.292.898.764-.555.764.555zm-6.362 3.936l-.292-.898-.292.898h-.944l.764.555-.292.899.764-.555.764.555-.292-.899.764-.555zm4.001-.686l.764-.555h-.945l-.291-.898-.292.898h-.945l.764.555-.292.898.765-.555.764.555zm0-10.504l.764-.555h-.945l-.291-.898-.292.898h-.945l.764.555-.292.898.765-.555.764.555zM9.582 27.662l-.764-.555h.945l.291-.898.292.898h.945l-.764.555.292.898-.765-.555-.764.555zm0-10.504l-.764-.555h.945l.291-.898.292.898h.945l-.764.555.292.898-.765-.555-.764.555z"/></svg>
\ No newline at end of file