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/1f3b6.svg b/public/emoji/1f3b6.svg
index f1e96a143..f13b3b8bf 100644
--- a/public/emoji/1f3b6.svg
+++ b/public/emoji/1f3b6.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(14.1816,35.8325)" id="g20"><path id="path22" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.363,-1.301 c -0.45,-0.093 -0.819,-0.544 -0.819,-1.003 l 0,-1.529 0,-2.255 0,-12.073 c -0.613,0.209 -1.287,0.328 -2,0.328 -2.761,0 -5,-1.741 -5,-3.888 0,-2.148 2.239,-3.889 5,-3.889 2.713,0 4.909,1.683 4.986,3.777 l 0.014,0 0,15.523 L 0,-5.455 c 0.45,0.093 0.818,0.544 0.818,1.003 l 0,3.785 C 0.818,-0.208 0.45,0.092 0,0"/></g><g transform="translate(35.1816,31.8325)" id="g24"><path id="path26" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.363,-1.301 c -0.45,-0.093 -0.819,-0.544 -0.819,-1.003 l 0,-1.529 0,-2.255 0,-12.073 c -0.613,0.209 -1.288,0.328 -2,0.328 -2.761,0 -5,-1.741 -5,-3.888 0,-2.148 2.239,-3.889 5,-3.889 2.713,0 4.909,1.683 4.986,3.777 l 0.014,0 0,15.523 L 0,-5.455 c 0.45,0.093 0.818,0.544 0.818,1.003 l 0,3.785 C 0.818,-0.208 0.45,0.092 0,0"/></g><g transform="translate(23.1816,25.8325)" id="g28"><path id="path30" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.363,-1.301 c -0.45,-0.093 -0.819,-0.544 -0.819,-1.003 l 0,-1.529 0,-2.255 0,-12.073 c -0.613,0.209 -1.287,0.328 -2,0.328 -2.761,0 -5,-1.741 -5,-3.888 0,-2.148 2.239,-3.889 5,-3.889 2.713,0 4.909,1.683 4.986,3.777 l 0.014,0 0,15.523 L 0,-5.455 c 0.45,0.093 0.818,0.544 0.818,1.003 l 0,3.785 C 0.818,-0.208 0.45,0.092 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5DADEC" d="M14.182.168L7.818 1.469C7.368 1.561 7 2.012 7 2.471v15.857C6.387 18.12 5.712 18 5 18c-2.762 0-5 1.741-5 3.889 0 2.147 2.238 3.889 5 3.889 2.713 0 4.908-1.683 4.985-3.777H10V6.477l4.182-.855c.45-.092.818-.543.818-1.002V.835c0-.459-.368-.76-.818-.667zm21 4l-6.363 1.301c-.451.092-.819.543-.819 1.002v15.857c-.613-.209-1.288-.328-2-.328-2.762 0-5 1.741-5 3.889 0 2.147 2.238 3.889 5 3.889 2.713 0 4.908-1.683 4.985-3.777H31V10.477l4.182-.855c.45-.092.818-.543.818-1.002V4.835c0-.459-.368-.76-.818-.667z"/><path fill="#5DADEC" d="M23.182 10.167l-6.363 1.301c-.451.093-.819.544-.819 1.003v15.857c-.613-.209-1.288-.328-2-.328-2.762 0-5 1.741-5 3.889s2.238 3.889 5 3.889c2.713 0 4.908-1.683 4.985-3.777H19V16.477l4.182-.855c.45-.092.818-.543.818-1.002v-3.785c0-.459-.368-.76-.818-.668z"/></svg>
\ No newline at end of file