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/1f309.svg b/public/emoji/1f309.svg
index 20776394b..e49295b41 100644
--- a/public/emoji/1f309.svg
+++ b/public/emoji/1f309.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,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 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:#004a77;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,-2 -38,0 0,38 38,0 0,-38 z"/><g transform="translate(-2,9)" id="g22"><path id="path24" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0.117,0.049 11.263,4.451 18,16 l 2,-1 C 12.911,4.847 0.503,0.206 0,0"/></g><g transform="translate(20,27)" id="g26"><path id="path28" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,2 -2,2 -4,2 -4,0 -4,0 l 0,-28 4,0 0,28 z"/></g><path id="path30" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,5 0,5 0,9 36,9 36,5 Z"/><g transform="translate(38,9)" id="g32"><path id="path34" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c -0.117,0.049 -11.264,4.451 -18,16 l -2,-1 C -12.91,4.847 -0.503,0.206 0,0"/></g><path id="path36" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,8 2,0 0,11 -2,0 0,-11 z"/><path id="path38" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,8 -2,0 0,11 2,0 0,-11 z"/><path id="path40" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 4,8 6,8 6,14 4,14 4,8 Z"/><path id="path42" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,7 -2,0 0,7 2,0 0,-7 z"/><g transform="translate(6.5,29)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.13 0.755,2.074 1.784,2.383 C -0.967,4.952 -1.227,5 -1.5,5 c -1.657,0 -3,-1.343 -3,-3 0,-1.657 1.343,-3 3,-3 0.959,0 1.803,0.458 2.353,1.159 C 0.585,0.062 0.301,0 0,0"/></g><g transform="translate(11,33.5)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(27,24.5)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(8,24.5)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(23,31)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(5,19)" id="g64"><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(13,29)" id="g68"><path id="path70" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(33,19)" id="g72"><path id="path74" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(27,30.5)" id="g76"><path id="path78" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(32,33)" id="g80"><path id="path82" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(32,28.5)" id="g84"><path id="path86" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#004A77" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FE5011" d="M32 23.958c1.575.963 2.957 1.676 4 2.171v-2.07C32.465 22.229 25.013 17.594 20 9c0 0 0-2-2-2s-2 2-2 2C10.987 17.594 3.535 22.229 0 24.059v2.07c1.043-.495 2.425-1.208 4-2.171V27H0v4h16v5h4v-5h16v-4h-4v-3.042zM30 27h-4v-7.435c1.362 1.186 2.716 2.214 4 3.095V27zM6 22.659c1.284-.88 2.637-1.908 4-3.094V27H6v-4.341zM12 27v-9.292c1.384-1.375 2.74-2.923 4-4.655V27h-4zm8-13.946c1.26 1.731 2.616 3.28 4 4.655V27h-4V13.054z"/><g fill="#FFF"><path d="M6.5 7C5.119 7 4 5.881 4 4.5c0-1.13.755-2.074 1.784-2.383C5.533 2.048 5.273 2 5 2 3.343 2 2 3.343 2 5s1.343 3 3 3c.959 0 1.803-.458 2.353-1.159C7.085 6.938 6.801 7 6.5 7z"/><circle cx="10.5" cy="2.5" r=".5"/><circle cx="26.5" cy="11.5" r=".5"/><circle cx="7.5" cy="11.5" r=".5"/><circle cx="22" cy="5" r="1"/><circle cx="4" cy="17" r="1"/><circle cx="12" cy="7" r="1"/><circle cx="32" cy="17" r="1"/><circle cx="26.5" cy="5.5" r=".5"/><circle cx="31" cy="3" r="1"/><circle cx="31.5" cy="7.5" r=".5"/></g></svg>
\ No newline at end of file