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/1f377.svg b/public/emoji/1f377.svg
index 4df8c35fa..b7925317c 100644
--- a/public/emoji/1f377.svg
+++ b/public/emoji/1f377.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(19,15.7451)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 10.042,2.213 10.042,16.005 0,1.481 -1.167,2.25 -3.416,2.25 l -7.124,0 -1.125,0 -1.125,0 -7.123,0 c -1.125,0 -3.329,0.262 -3.329,-2.125 C -13.2,2.422 -3,0 -3,0 l 0,-10.123 c 0,0 -4.584,-2.34 -5.498,-2.883 -0.984,-0.562 -0.33,-1.462 0.063,-1.617 0.657,-0.258 2.254,-1.102 6.781,-1.102 4.64,0 6.202,0.914 6.764,1.102 0.217,0.072 1.347,0.932 0.011,1.723 C 2.743,-11.492 0,-10.123 0,-10.123 L 0,0 Z"/></g><g transform="translate(29,32.5576)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.621 -3.547,-2.935 -11.623,-2.935 -8.076,0 -11.623,1.314 -11.623,2.935 0,1.622 3.547,2.935 11.623,2.935 C -3.547,2.935 0,1.622 0,0"/></g><g transform="translate(7.4585,32.4165)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.042,-9.5 5.458,-12.792 8.699,-13.835 1.11,-0.358 2.026,-0.428 2.801,-0.123 3.5,1.375 7.542,5.666 8.167,13.583 C 19.828,1.662 0,0 0,0"/></g><g transform="translate(9,26.5)" id="g32"><path id="path34" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-3.5 3.333,-8.5 8.333,-8.5 13.334,-8.5 17,-3.042 17,-0.042 11,-0.042 0,0 0,0"/></g><g transform="translate(26,26.5)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.829 -3.806,-1.5 -8.5,-1.5 -4.694,0 -8.5,0.671 -8.5,1.5 0,0.829 3.806,1.5 8.5,1.5 C -3.806,1.5 0,0.829 0,0"/></g><g transform="translate(17.168,29.3408)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.03,0 -8.783,1.11 -9.801,1.587 -0.5,0.235 -0.715,0.83 -0.481,1.33 0.234,0.501 0.831,0.716 1.33,0.481 C -7.713,2.816 0.502,0.504 9.644,3.525 10.167,3.699 10.732,3.414 10.906,2.89 11.08,2.365 10.795,1.799 10.271,1.626 6.594,0.411 3.061,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M19 20.255S29.042 18.042 29.042 4.25c0-1.481-1.167-2.25-3.416-2.25H9.129C8.004 2 5.8 1.738 5.8 4.125c0 13.708 10.2 16.13 10.2 16.13v10.123s-4.584 2.34-5.498 2.883c-.984.562-.33 1.462.063 1.617.656.258 2.253 1.102 6.78 1.102 4.641 0 6.202-.914 6.765-1.102.217-.072 1.347-.932.011-1.723C21.743 31.747 19 30.378 19 30.378V20.255z"/><path fill="#CCD6DD" d="M29 3.442c0 1.621-3.547 2.935-11.623 2.935-8.076 0-11.623-1.314-11.623-2.935C5.754 1.82 9.301.507 17.377.507 25.453.507 29 1.821 29 3.442z"/><path fill="#CCD6DD" d="M7.458 3.583c2.042 9.5 5.458 12.792 8.699 13.835 1.11.358 2.026.428 2.801.123 3.5-1.375 7.542-5.667 8.167-13.583.161-2.037-19.667-.375-19.667-.375z"/><path fill="#A0041E" d="M9 9.5C9 13 12.333 18 17.333 18S26 12.542 26 9.542c-6 0-17-.042-17-.042z"/><ellipse fill="#DD2E44" cx="17.5" cy="9.5" rx="8.5" ry="1.5"/><path fill="#FFF" d="M17.168 6.659c-5.03 0-8.783-1.11-9.801-1.587-.5-.234-.715-.83-.481-1.33.234-.501.831-.716 1.33-.481 1.239.582 9.455 2.894 18.596-.127.523-.174 1.088.112 1.262.636.174.524-.111 1.09-.636 1.264-3.676 1.214-7.209 1.625-10.27 1.625z"/></svg>
\ No newline at end of file