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/1f1ec-1f1e9.svg b/public/emoji/1f1ec-1f1e9.svg
index 33a1f9b84..e4f37f95a 100644
--- a/public/emoji/1f1ec-1f1e9.svg
+++ b/public/emoji/1f1ec-1f1e9.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,31 36,31 36,5 0,5 0,31 Z"/><g transform="translate(3.5,27.5)" id="g22"><path id="path24" style="fill:#007a5e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 29,0 29,-19 0,-19 0,0 Z"/></g><g transform="translate(3.5,27.5)" id="g26"><path id="path28" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 29,0 0,-19 29,-19 0,0 Z"/></g><g transform="translate(21.5,18)" id="g30"><path id="path32" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><g transform="translate(18,21.2016)" id="g34"><path id="path36" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.719,-2.212 2.326,0 L 1.163,-3.579 1.882,-5.792 0,-4.424 l -1.882,-1.368 0.719,2.213 -1.882,1.367 2.326,0 L 0,0 Z"/></g><g transform="translate(18,30.818)" id="g38"><path id="path40" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.386,-1.188 1.249,0 L 0.625,-1.922 1.011,-3.11 0,-2.376 -1.011,-3.11 l 0.386,1.188 -1.01,0.734 1.249,0 L 0,0 Z"/></g><g transform="translate(26.0201,30.818)" id="g42"><path id="path44" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.386,-1.188 1.249,0 L 0.625,-1.922 1.011,-3.11 0,-2.376 -1.011,-3.11 l 0.386,1.188 -1.01,0.734 1.249,0 L 0,0 Z"/></g><g transform="translate(9.9799,30.818)" id="g46"><path id="path48" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.386,-1.188 1.249,0 L 0.625,-1.922 1.011,-3.11 0,-2.376 -1.011,-3.11 l 0.386,1.188 -1.01,0.734 1.249,0 L 0,0 Z"/></g><g transform="translate(18,8.3179)" id="g50"><path id="path52" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.386,-1.188 1.249,0 L 0.625,-1.922 1.011,-3.11 0,-2.376 -1.011,-3.11 l 0.386,1.188 -1.01,0.734 1.249,0 L 0,0 Z"/></g><g transform="translate(26.0201,8.3179)" id="g54"><path id="path56" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.386,-1.188 1.249,0 L 0.625,-1.922 1.011,-3.11 0,-2.376 -1.011,-3.11 l 0.386,1.188 -1.01,0.734 1.249,0 L 0,0 Z"/></g><g transform="translate(9.9799,8.3179)" id="g58"><path id="path60" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.386,-1.188 1.249,0 L 0.625,-1.922 1.011,-3.11 0,-2.376 -1.011,-3.11 l 0.386,1.188 -1.01,0.734 1.249,0 L 0,0 Z"/></g><g transform="translate(6.1179,16.9331)" id="g62"><path id="path64" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.304,-0.315 0.645,-0.579 0.962,-0.712 0.967,-0.363 0.905,0.036 0.798,0.436 0.53,0.687 0.227,0.9 -0.07,1.013 -0.113,0.695 -0.082,0.34 0,0"/></g><g transform="translate(7.6426,16.4369)" id="g66"><path id="path68" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.803,2.916 -2.06,2.738 -2.803,3.67 0.512,-1.068 -1.329,-3.617 1.739,-4.214 -0.203,0.276 -0.366,0.649 -0.461,1.04 -0.082,0.341 -0.113,0.695 -0.07,1.013 0.297,-0.113 0.6,-0.326 0.869,-0.577 C -0.413,0.639 -0.148,0.295 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CE1126" d="M32 5H4C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#007A5E" d="M3.5 8.5h29v19h-29z"/><path fill="#FCD116" d="M3.5 8.5h29l-29 19h29l-29-19z"/><circle fill="#CE1126" cx="18" cy="18" r="3.5"/><path d="M18 14.798l.719 2.213h2.326l-1.882 1.367.719 2.212L18 19.223l-1.882 1.367.719-2.212-1.882-1.367h2.326zm0-9.616l.386 1.188h1.249l-1.01.734.386 1.188L18 7.558l-1.011.734.386-1.188-1.01-.734h1.249zm8.02 0l.386 1.188h1.249l-1.01.734.386 1.188-1.011-.734-1.01.734.386-1.188-1.011-.734h1.249zm-16.04 0l.386 1.188h1.249l-1.011.734.386 1.188-1.01-.734-1.011.734.386-1.188-1.01-.734h1.249zm8.02 22.5l.386 1.188h1.249l-1.01.734.386 1.188L18 30.058l-1.011.734.386-1.188-1.01-.734h1.249zm8.02 0l.386 1.188h1.249l-1.01.734.386 1.188-1.011-.734-1.01.734.386-1.188-1.011-.734h1.249zm-16.04 0l.386 1.188h1.249l-1.011.734.386 1.188-1.01-.734-1.011.734.386-1.188-1.01-.734h1.249z" fill="#FCD116"/><path fill="#CE1126" d="M6.118 19.067c.304.315.645.579.962.712.005-.349-.057-.748-.164-1.148-.268-.251-.572-.464-.868-.577-.043.318-.012.673.07 1.013z"/><path fill="#FCD116" d="M7.643 19.563c.803-2.916-2.06-2.738-2.803-3.67.512 1.068-1.329 3.617 1.739 4.214-.202-.276-.366-.649-.46-1.04-.082-.34-.113-.695-.07-1.013.297.113.6.326.868.577.313.293.578.637.726.932z"/></svg>
\ No newline at end of file