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/1f9d3.svg b/public/emoji/1f9d3.svg
index 357601039..920069772 100644
--- a/public/emoji/1f9d3.svg
+++ b/public/emoji/1f9d3.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(22,24)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4,0 -9,2 -9,2 0,0 -2,-1 -3,-2 -1.863,-1.863 -3.724,-5.372 -3.971,-8.312 C -15.664,-16.487 -14.25,-23 -4,-23 6.25,-23 7.606,-16.56 7.965,-8.449 7.613,-4.819 3.81,0 0,0"/></g><g transform="translate(18,4.5003)" id="g24"><path id="path26" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.347,0 -3.575,1.16 -3.707,1.293 -0.391,0.391 -0.391,1.023 0,1.414 0.387,0.387 1.013,0.39 1.404,0.01 C -2.251,2.67 -1.497,2 0,2 1.519,2 2.273,2.689 2.305,2.719 2.703,3.092 3.332,3.081 3.713,2.689 4.092,2.297 4.093,1.679 3.707,1.293 3.575,1.16 2.347,0 0,0"/></g><g transform="translate(19,9.5)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(13,12)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(23,12)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(25.5,15.9998)" id="g40"><path id="path42" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 L 0,2 C 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(13.5,15.9998)" id="g44"><path id="path46" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(17.9976,31)" id="g48"><path id="path50" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 8.205,0 13.331,-5.137 13.331,-10.182 0,-5.044 -1.025,-7.063 -2.051,-5.044 -1.026,2.017 -2.278,5.226 -2.278,5.226 0,0 -3,-2 -6,0.828 0,0 1.1,-6.054 -5.053,0 0,0 0.053,-3.828 -5.127,1.008 0,0 -3.077,-2.018 -4.103,-7.062 -0.284,-1.401 -2.051,0 -2.051,5.044 C -13.332,-5.137 -9.23,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M22 12c-4 0-9-2-9-2s-2 1-3 2c-1.863 1.863-3.724 5.372-3.971 8.312C6.336 28.487 7.75 35 18 35s11.606-6.44 11.965-14.551C29.613 16.819 25.81 12 22 12z"/><path d="M18 31.5c-2.347 0-3.575-1.16-3.707-1.293-.391-.391-.391-1.023 0-1.414.387-.387 1.013-.39 1.404-.01.051.047.806.717 2.303.717 1.519 0 2.273-.689 2.305-.719.398-.373 1.027-.362 1.408.029.379.393.38 1.011-.006 1.396-.132.133-1.36 1.294-3.707 1.294zm1-5h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#C1694F"/><path d="M13 24c-.552 0-1-.447-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .553-.447 1-1 1z" fill="#662113"/><path d="M25.5 20h-3c-.553 0-1-.448-1-1s.447-1 1-1h3c.553 0 1 .448 1 1s-.447 1-1 1zm-12 0h-3c-.552 0-1-.448-1-1s.448-1 1-1h3c.552 0 1 .448 1 1s-.448 1-1 1z" fill="#D1D3D4"/><path fill="#D1D3D4" d="M17.998 5c8.205 0 13.331 5.137 13.331 10.182 0 5.044-1.026 7.064-2.051 5.044C28.252 18.209 27 15 27 15s-3 2-6-.828c0 0 1.1 6.054-5.054 0 0 0 .054 3.828-5.127-1.008 0 0-3.077 2.018-4.102 7.062-.284 1.401-2.051 0-2.051-5.044C4.666 10.137 8.768 5 17.998 5"/></svg>
\ No newline at end of file