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/1f647-1f3fe.svg b/public/emoji/1f647-1f3fe.svg
index 851dae93d..3f55ae820 100644
--- a/public/emoji/1f647-1f3fe.svg
+++ b/public/emoji/1f647-1f3fe.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(27,14)" id="g20"><path id="path22" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c 0,0 -9,0 -9,-7 0,-3.156 4,-7 4,-7 l 1,0 1,0 4,0 16,0 4,0 1,0 1,0 c 0,0 4,3.844 4,7 0,7 -9,7 -9,7"/></g><g transform="translate(21,8)" id="g24"><path id="path26" style="fill:#9b6a49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(9,26.0625)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11.063 c 0,-4.97 4.029,-8.999 9,-8.999 4.971,0 9,4.029 9,8.999 L 18,-0.312 0,0 Z"/></g><g transform="translate(10.8472,18.2848)" id="g32"><path id="path34" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.801,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.801,2.861 0,1.58 0,0"/></g><g transform="translate(28.7292,18.2848)" id="g36"><path id="path38" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.8,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.8,2.861 0,1.58 0,0"/></g><g transform="translate(18,31.1772)" id="g40"><path id="path42" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.019,0 -10.139,-4.684 -10.139,-8.588 0,-3.903 1.343,-4.986 1.56,-3.903 0.78,3.903 3.119,5.102 3.119,5.102 4.68,-3.904 3.9,-0.781 3.9,-0.781 4.68,-4.684 2.34,0 2.34,0 1.56,-1.562 6.239,-1.562 6.239,-1.562 0,0 0.78,-1.198 1.56,-2.759 0.78,-1.561 1.56,0 1.56,3.903 C 10.139,-4.684 6.239,0 0,0"/></g><g transform="translate(17,2)" id="g44"><path id="path46" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,1 -2,1 -3,0 -1,-4 5,0 6,0 c 1,0 1,1 1,1 0,0.553 -1,1 -1,1"/></g><g transform="translate(26,4)" id="g48"><path id="path50" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,-1 -5,-1 c 0,0 -1,-0.447 -1,-1 0,0 0,-1 1,-1 l 6,0 5,0 -1,4 -3,0 z"/></g><g transform="translate(22,14)" id="g52"><path id="path54" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,1 C -1,2.553 -0.553,3 0,3 0.553,3 1,2.553 1,2 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(14,14)" id="g56"><path id="path58" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,1 C -1,2.553 -0.552,3 0,3 0.552,3 1,2.553 1,2 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(19,9.5)" id="g60"><path id="path62" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(5.4989,28)" id="g64"><path id="path66" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.208,0 -0.419,0.065 -0.599,0.2 l -4,3 c -0.442,0.331 -0.531,0.958 -0.2,1.4 0.332,0.442 0.958,0.531 1.4,0.2 l 4,-3 C 1.043,1.469 1.132,0.842 0.801,0.4 0.605,0.138 0.304,0 0,0"/></g><g transform="translate(8.5009,31)" id="g68"><path id="path70" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.323,0 -0.64,0.156 -0.833,0.445 l -2,3 c -0.306,0.46 -0.182,1.081 0.277,1.387 0.46,0.307 1.08,0.182 1.387,-0.277 l 2,-3 C 1.137,1.095 1.013,0.474 0.554,0.168 0.383,0.054 0.19,0 0,0"/></g><g transform="translate(30.5009,28)" id="g72"><path id="path74" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.305,0 -0.604,0.138 -0.801,0.4 -0.332,0.442 -0.242,1.069 0.2,1.4 l 4,3 C 3.84,5.133 4.468,5.042 4.799,4.6 5.131,4.158 5.041,3.531 4.599,3.2 l -4,-3 C 0.419,0.065 0.209,0 0,0"/></g><g transform="translate(27.4989,31)" id="g76"><path id="path78" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.19,0 -0.383,0.054 -0.554,0.168 -0.46,0.306 -0.584,0.927 -0.277,1.387 l 2,3 C 1.475,5.014 2.094,5.139 2.556,4.832 3.016,4.526 3.14,3.905 2.833,3.445 l -2,-3 C 0.641,0.156 0.323,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M27 22H9s-9 0-9 7c0 3.156 4 7 4 7h28s4-3.844 4-7c0-7-9-7-9-7z"/><circle fill="#9B6A49" cx="18" cy="28" r="3"/><path fill="#AF7E57" d="M9 9.938V21c0 4.971 4.029 9 9 9s9-4.029 9-9V10.25L9 9.938z"/><path fill="#AF7E57" d="M10.847 17.715c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.801-2.861 1.788-2.861s1.788 1.281 1.788 2.861zm17.882 0c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.8-2.861 1.788-2.861s1.788 1.281 1.788 2.861z"/><path fill="#60352A" d="M18 4.823c-7.019 0-10.139 4.684-10.139 8.588 0 3.903 1.343 4.986 1.56 3.903.78-3.903 3.12-5.101 3.12-5.101 4.68 3.904 3.9.781 3.9.781 4.679 4.684 2.34 0 2.34 0 1.56 1.562 6.239 1.562 6.239 1.562s.78 1.198 1.559 2.759c.78 1.562 1.56 0 1.56-3.903 0-3.905-3.9-8.589-10.139-8.589z"/><path fill="#AF7E57" d="M17 34l-5-1-2-1H7l-1 4h11c1 0 1-1 1-1 0-.553-1-1-1-1zm9-2l-2 1-5 1s-1 .447-1 1c0 0 0 1 1 1h11l-1-4h-3z"/><path fill="#60352A" d="M22 22c-.553 0-1-.447-1-1v-1c0-.553.447-1 1-1s1 .447 1 1v1c0 .553-.447 1-1 1zm-8 0c-.552 0-1-.447-1-1v-1c0-.553.448-1 1-1s1 .447 1 1v1c0 .553-.448 1-1 1z"/><path fill="#915A34" d="M19 26.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path d="M5.499 8c-.209 0-.419-.065-.599-.2l-4-3C.458 4.469.369 3.842.7 3.4c.332-.441.958-.531 1.4-.2l4 3c.442.331.531.958.2 1.4-.197.262-.497.4-.801.4zm3.002-3c-.323 0-.64-.156-.833-.445l-2-3c-.306-.46-.182-1.081.277-1.387.459-.307 1.08-.182 1.387.277l2 3c.306.459.182 1.081-.277 1.387-.171.114-.364.168-.554.168zm22 3c-.305 0-.604-.138-.801-.4-.332-.442-.242-1.069.2-1.4l4-3c.44-.333 1.068-.242 1.399.2.332.442.242 1.069-.2 1.4l-4 3c-.179.135-.389.2-.598.2zm-3.002-3c-.19 0-.383-.054-.554-.168-.46-.306-.584-.927-.277-1.387l2-3c.306-.459.925-.585 1.387-.277.46.306.584.927.277 1.387l-2 3c-.192.289-.51.445-.833.445z" fill="#5DADEC"/></svg>
\ No newline at end of file