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/1f1f8-1f1ee.svg b/public/emoji/1f1f8-1f1ee.svg
index aa66a1599..e25c04c83 100644
--- a/public/emoji/1f1f8-1f1ee.svg
+++ b/public/emoji/1f1f8-1f1ee.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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" 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><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" 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:#eeeeee;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></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><path id="path32" style="fill:#005da4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 0,13 0,23 36,23 36,13 Z"/><path id="path34" style="fill:#ed1c23;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,5 0,5 0,13 36,13 36,5 Z"/></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(11.125,28.0835)" id="g44"><path id="path46" style="fill:#ed1c23;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.25,0 -3.833,-0.833 -3.833,-0.833 0,0 0.145,-2 0.333,-5.084 C -3.313,-9 0,-10.083 0,-10.083 c 0,0 3.313,1.083 3.5,4.166 0.188,3.084 0.333,5.084 0.333,5.084 C 3.833,-0.833 2.25,0 0,0"/></g><g transform="translate(14.5918,27.4136)" id="g48"><path id="path50" style="fill:#004a77;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.588,0.242 -1.849,0.67 -3.467,0.67 -1.617,0 -2.879,-0.428 -3.467,-0.67 0.012,-0.21 0.138,-2.503 0.3,-5.164 0.17,-2.791 3.167,-3.771 3.167,-3.771 0,0 2.998,0.98 3.168,3.771 C -0.137,-2.503 -0.011,-0.21 0,0"/></g><g transform="translate(12.104,20.0801)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.354,0 -0.521,-0.211 -1.042,-0.211 -1.562,-0.211 -1.646,0 -2,0 c -0.268,0 -0.434,-0.12 -0.639,-0.179 0.812,-0.61 1.66,-0.86 1.66,-0.86 0.711,0.118 1.27,0.466 1.693,0.859 C 0.445,-0.121 0.27,0 0,0"/></g><g transform="translate(10.146,21.4629)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.333,0 0.625,-0.26 0.979,-0.26 1.333,-0.26 1.583,0 1.958,0 2.279,0 2.701,-0.419 3.318,-0.179 3.596,0.29 3.729,0.663 3.729,0.663 L 2.479,2.455 1.854,1.695 0.979,3.371 0.146,1.695 -0.458,2.494 c 0,0 -0.542,-0.643 -1.438,-1.851 0.107,-0.286 0.251,-0.534 0.407,-0.766 C -0.78,-0.473 -0.302,0 0,0"/></g><g transform="translate(13.104,20.7085)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.458,0 -0.646,0.26 -1,0.26 -1.354,0.26 -1.521,0 -2.042,0 -2.563,0 -2.646,0.26 -3,0.26 -3.354,0.26 -3.53,0 -3.854,0 c -0.117,0 -0.248,0.036 -0.373,0.085 0.127,-0.168 0.253,-0.341 0.39,-0.483 0.386,0.034 0.673,0.273 0.879,0.273 0.333,0 0.625,-0.278 0.979,-0.278 0.354,0 0.604,0.278 0.979,0.278 0.231,0 0.516,-0.236 0.887,-0.271 0.11,0.142 0.205,0.283 0.293,0.423 C 0.122,0.017 0.067,0 0,0"/></g><g transform="translate(10.3184,27.1929)" id="g64"><path id="path66" style="fill:#ffdd00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.217,-0.233 -0.31,0.072 -0.093,-0.304 -0.093,0.304 -0.31,-0.072 L -0.372,0 -0.589,0.233 -0.279,0.161 -0.186,0.465 -0.093,0.161 0.217,0.233 0,0 Z"/></g><g transform="translate(12.4121,27.1929)" id="g68"><path id="path70" style="fill:#ffdd00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.217,-0.233 -0.31,0.072 -0.093,-0.304 -0.093,0.304 -0.31,-0.072 L -0.372,0 -0.589,0.233 -0.279,0.161 -0.186,0.465 -0.093,0.161 0.217,0.233 0,0 Z"/></g><g transform="translate(11.3276,25.7974)" id="g72"><path id="path74" style="fill:#ffdd00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.217,-0.233 -0.31,0.072 -0.093,-0.304 -0.093,0.304 -0.31,-0.072 L -0.372,0 -0.589,0.233 -0.279,0.161 -0.186,0.465 -0.093,0.161 0.217,0.233 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#ED1C23" d="M36 27v-4H0v4c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4z"/><path fill="#EEE" d="M36 23H0V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v14z"/><path fill="#005DA4" d="M0 13h36v10H0z"/><path fill="#ED1C23" d="M11.125 7.917c-2.25 0-3.833.833-3.833.833s.146 2 .333 5.083 3.5 4.167 3.5 4.167 3.312-1.083 3.5-4.167.333-5.083.333-5.083-1.583-.833-3.833-.833z"/><path fill="#004A77" d="M14.592 8.586c-.588-.242-1.849-.67-3.467-.67s-2.879.428-3.467.67c.011.21.137 2.503.299 5.164.17 2.791 3.167 3.771 3.167 3.771s2.998-.98 3.167-3.771c.164-2.66.29-4.954.301-5.164z"/><path fill="#FFF" d="M12.104 15.92c-.354 0-.521.211-1.042.211s-.604-.211-.958-.211c-.268 0-.434.12-.639.179.812.61 1.66.86 1.66.86.711-.118 1.27-.466 1.693-.859-.269-.059-.445-.18-.714-.18zm-1.958-1.383c.333 0 .625.26.979.26s.604-.26.979-.26c.321 0 .743.419 1.36.179.278-.469.411-.841.411-.841l-1.25-1.792-.625.759-.875-1.675-.833 1.675-.604-.799s-.542.643-1.438 1.851c.107.286.251.534.407.766.709.35 1.187-.123 1.489-.123zm2.958.755c-.458 0-.646-.26-1-.26s-.521.26-1.042.26-.604-.26-.958-.26-.53.26-.854.26c-.117 0-.248-.036-.373-.085.127.168.252.341.39.484.386-.035.673-.273.879-.273.333 0 .625.278.979.278s.604-.278.979-.278c.231 0 .516.235.887.271.109-.142.205-.283.293-.423-.058.009-.113.026-.18.026z"/><path fill="#FD0" d="M10.318 8.807l.217.233-.309-.072-.094.304-.092-.304-.311.072.218-.233-.218-.233.311.072.092-.304.094.304.309-.072zm2.094 0l.217.233-.31-.072-.093.304-.093-.304-.31.072.217-.233-.217-.233.31.072.093-.304.093.304.31-.072zm-1.084 1.396l.216.233-.309-.072-.093.303-.093-.303-.31.072.217-.233-.217-.233.31.072.093-.304.093.304.309-.072z"/></svg>
\ No newline at end of file