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/2744.svg b/public/emoji/2744.svg
index 26d6d72ad..258c161bb 100644
--- a/public/emoji/2744.svg
+++ b/public/emoji/2744.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,8.4141)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,19.171 4.828,24 c 0,0 0.707,0.707 0,1.415 -0.707,0.707 -1.414,0 -1.414,0 L 0,22 0,26.586 c 0,0 0,1 -1,1 -1,0 -1,-1 -1,-1 L -2,22 -5.414,25.415 c 0,0 -0.707,0.707 -1.414,0 -0.707,-0.708 0,-1.415 0,-1.415 L -2,19.171 -2,0 -6.828,-4.828 c 0,0 -0.707,-0.707 0,-1.414 0.707,-0.707 1.414,0 1.414,0 L -2,-2.828 -2,-7.414 c 0,0 0,-1 1,-1 1,0 1,1 1,1 l 0,4.586 3.414,-3.414 c 0,0 0.707,-0.707 1.414,0 0.707,0.707 0,1.414 0,1.414 L 0,0 Z"/></g><g transform="translate(34.6221,15.1338)" id="g24"><path id="path26" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.259,0.966 -1.225,0.707 -1.225,0.707 l -6.594,-1.767 -16.604,9.586 -1.767,6.595 c 0,0 -0.259,0.966 -1.225,0.707 -0.967,-0.259 -0.707,-1.224 -0.707,-1.224 l 1.249,-4.664 -3.971,2.293 c 0,0 -0.866,0.5 -1.366,-0.366 -0.5,-0.866 0.366,-1.366 0.366,-1.366 l 3.971,-2.293 -4.663,-1.249 c 0,0 -0.967,-0.259 -0.707,-1.225 0.259,-0.966 1.224,-0.707 1.224,-0.707 l 6.596,1.767 16.604,-9.586 1.766,-6.596 c 0,0 0.259,-0.966 1.225,-0.707 0.966,0.26 0.707,1.225 0.707,1.225 l -1.25,4.664 3.972,-2.293 c 0,0 0.867,-0.5 1.367,0.365 0.5,0.867 -0.367,1.367 -0.367,1.367 l -3.971,2.293 4.663,1.249 c 0,0 0.966,0.259 0.707,1.225"/></g><g transform="translate(33.915,22.0928)" id="g28"><path id="path30" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.664,1.249 3.972,2.293 c 0,0 0.867,0.501 0.367,1.367 -0.501,0.867 -1.367,0.366 -1.367,0.366 l -3.971,-2.293 1.249,4.663 c 0,0 0.259,0.966 -0.707,1.225 -0.966,0.259 -1.225,-0.707 -1.225,-0.707 l -1.767,-6.595 -16.604,-9.587 -6.594,1.768 c 0,0 -0.966,0.259 -1.225,-0.707 -0.26,-0.967 0.707,-1.225 0.707,-1.225 l 4.663,-1.249 -3.972,-2.293 c 0,0 -0.865,-0.501 -0.365,-1.367 0.5,-0.865 1.365,-0.365 1.365,-0.365 l 3.973,2.293 -1.251,-4.663 c 0,0 -0.259,-0.967 0.707,-1.225 0.967,-0.26 1.226,0.706 1.226,0.706 l 1.767,6.597 16.604,9.585 6.594,-1.768 c 0,0 0.966,-0.259 1.225,0.707 C 0.965,-0.258 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M19 27.586V8.415l4.828-4.829s.707-.707 0-1.415c-.707-.707-1.414 0-1.414 0L19 5.586V1s0-1-1-1-1 1-1 1v4.586l-3.414-3.415s-.707-.707-1.414 0c-.707.708 0 1.415 0 1.415L17 8.415v19.171l-4.828 4.828s-.707.707 0 1.414 1.414 0 1.414 0L17 30.414V35s0 1 1 1 1-1 1-1v-4.586l3.414 3.414s.707.707 1.414 0 0-1.414 0-1.414L19 27.586z"/><path fill="#88C9F9" d="M34.622 20.866c-.259-.966-1.225-.707-1.225-.707l-6.595 1.767-16.603-9.586-1.767-6.595s-.259-.966-1.225-.707C6.24 5.297 6.5 6.263 6.5 6.263l1.25 4.664-3.972-2.294s-.866-.5-1.366.366c-.5.866.366 1.366.366 1.366l3.971 2.293-4.664 1.249s-.967.259-.707 1.225c.259.967 1.225.708 1.225.708l6.596-1.767 16.603 9.586 1.767 6.596s.259.966 1.225.707c.966-.26.707-1.225.707-1.225l-1.25-4.664 3.972 2.293s.867.5 1.367-.365c.5-.867-.367-1.367-.367-1.367l-3.971-2.293 4.663-1.249c0-.001.966-.26.707-1.226z"/><path fill="#88C9F9" d="M33.915 13.907l-4.664-1.25 3.972-2.293s.867-.501.367-1.367c-.501-.867-1.367-.366-1.367-.366l-3.971 2.292 1.249-4.663s.259-.966-.707-1.225c-.966-.259-1.225.707-1.225.707l-1.767 6.595-16.604 9.589-6.594-1.768s-.966-.259-1.225.707c-.26.967.707 1.225.707 1.225l4.663 1.249-3.971 2.293s-.865.501-.365 1.367c.5.865 1.365.365 1.365.365l3.972-2.293-1.25 4.663s-.259.967.707 1.225c.967.26 1.226-.706 1.226-.706l1.768-6.597 16.604-9.585 6.595 1.768s.966.259 1.225-.707c.255-.967-.71-1.225-.71-1.225z"/></svg>
\ No newline at end of file