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/1f6e5.svg b/public/emoji/1f6e5.svg
index 50e7c3d36..b9badb2e3 100644
--- a/public/emoji/1f6e5.svg
+++ b/public/emoji/1f6e5.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(35,17)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -3,0 c -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.552 0.447,1 1,1 l 3,0 C -0.447,3 0,2.552 0,2 L 0,0 Z"/></g><path id="path24" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,11 2,0 0,7 -2,0 0,-7 z"/><g transform="translate(6,16.7812)" id="g26"><path id="path28" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 5,4.219 10,4.219 l 0.029,0 -0.029,-5 c 0,0 0,-1 -4,-1 C 2,-1.781 0,0 0,0"/></g><g transform="translate(7.2476,16.8994)" id="g30"><path id="path32" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.55,2.691 6.752,3.058 7.752,3.058 l 0,-3.957 C 7.752,-4.061 0,0 0,0"/></g><g transform="translate(33,11.0361)" id="g34"><path id="path36" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.5,4.013 -1,5.731 l -31,1.147 c 0,0 2,-3.439 6,-5.732 C -22,-1.146 0,0 0,0"/></g><g transform="translate(7,12.1826)" id="g38"><path id="path40" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,-2.292 26,-1.146 26,-1.146 0,0 0.288,2.334 -0.24,4.206 L -4.922,4.229 C -3.945,3.023 -2.308,1.323 0,0"/></g><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,12 0,12 0,0 36,0 36,12 Z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M35 19c0 .553-.447 1-1 1h-3c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1h3c.553 0 1 .448 1 1v2z"/><path fill="#66757F" d="M32 18h2v7h-2z"/><path fill="#E1E8ED" d="M6 19.219S11 15 16 15h.029L16 20s0 1-4 1-6-1.781-6-1.781z"/><path fill="#3B88C3" d="M7.248 19.101C10.798 16.41 14 16.043 15 16.043V20c0 3.162-7.752-.899-7.752-.899z"/><path fill="#CCD6DD" d="M33 24.964s.5-4.013-1-5.731L1 18.086s2 3.439 6 5.732c4 2.291 26 1.146 26 1.146z"/><path fill="#F4900C" d="M7 23.817c4 2.292 26 1.146 26 1.146s.288-2.335-.24-4.206L2.078 19.589c.977 1.205 2.614 2.905 4.922 4.228z"/><path fill="#55ACEE" d="M0 24h36v12H0z"/></svg>
\ No newline at end of file