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/1f595-1f3fe.svg b/public/emoji/1f595-1f3fe.svg
index 0f3c877bc..571c54c3b 100644
--- a/public/emoji/1f595-1f3fe.svg
+++ b/public/emoji/1f595-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(30.0107,15.8174)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.093,2.362 -1.792,3.068 -3.459,3.693 -4.1,2.446 -4.1,2.446 c 0,0 0.058,1.914 -1.942,2.622 -1.885,0.668 -2.984,-0.773 -2.984,-0.773 0,0 -0.073,1.686 -2.058,2.232 C -12.755,6.986 -14,5.36 -14,5.36 l 0,0.823 c 0,0.959 -0.542,2.575 -2.543,2.576 C -18.543,8.761 -19,7.1 -19,6.183 l 0,-1.615 c 0,-1.323 -0.948,-0.198 -1.636,-0.823 -1.57,-1.427 -2.269,-6.431 -1.187,-10.5 1.312,-4.937 4.062,-9.1 9.694,-9.1 8.132,0 12.124,5.297 12.129,11.923 L 0,0 Z"/></g><g transform="translate(21,17.5)" id="g24"><path id="path26" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 l 0,16 c 0,1.381 1.119,2.5 2.5,2.5 C -1.119,18.5 0,17.381 0,16 L 0,0 Z"/></g><g transform="translate(12.25,20)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.378,0 -2.001,-0.003 -2.313,-0.003 -1.625,0 -2.14,-0.466 -2.812,-3.122 -0.437,-1.729 -0.984,-2.547 -0.984,-4.391 0,-2.906 4.594,-12.347 11.359,-12.39 L 0,0 Z"/></g><g transform="translate(10,10.4795)" id="g32"><path id="path34" style="fill:#845636;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.252 0.204,-0.48 0.456,-0.48 l 0.088,0 C 0.796,-0.48 1,-0.275 1,-0.023 L 1,9.52 0.031,9.52 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M30.011 20.183s.093-2.362-1.792-3.068c-1.667-.625-2.309.622-2.309.622s.059-1.914-1.941-2.622c-1.885-.668-2.984.773-2.984.773s-.072-1.687-2.058-2.232c-1.671-.459-2.916 1.167-2.916 1.167v-.822c0-.959-.542-2.575-2.543-2.576-2-.002-2.457 1.659-2.457 2.576v1.614c0 1.323-.948.198-1.636.823-1.57 1.427-2.269 6.431-1.188 10.5 1.312 4.938 4.062 9.101 9.694 9.101 8.132 0 12.124-5.298 12.129-11.924l.001-3.932z"/><path fill="#AF7E57" d="M21 18.5c0 1.381-1.119 2.5-2.5 2.5S16 19.881 16 18.5v-16C16 1.119 17.119 0 18.5 0S21 1.119 21 2.5v16zM12.25 16l-2.312.003c-1.625 0-2.141.465-2.812 3.122-.438 1.729-.984 2.547-.984 4.391 0 2.906 4.594 12.348 11.359 12.391L12.25 16z"/><path fill="#845636" d="M10 25.521c0 .251.204.479.456.479h.088c.252 0 .456-.204.456-.456V16h-.969L10 25.521z"/></svg>
\ No newline at end of file