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/1f955.svg b/public/emoji/1f955.svg
index cf125d4f1..b949554ff 100644
--- a/public/emoji/1f955.svg
+++ b/public/emoji/1f955.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 11.815,23.013 C 4.2,15.397 -1.265,2.86 0.502,1.093 l 0,0 c 1.768,-1.768 14.305,3.698 21.92,11.313 l 0,0 c 7.616,7.615 7.562,11.53 4.243,14.85 l 0,0 c -1.328,1.328 -2.752,2.133 -4.47,2.133 l 0,0 c -2.575,0 -5.812,-1.809 -10.38,-6.376"/></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(31.0957,27.0674)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.535,2.122 4.408,8.32 3.701,7.613 0.707,0.707 -5.657,0 -7.778,-3.536 0,1.414 -1.414,7.071 -3.535,2.121 -2.122,-4.949 -1.415,-5.656 -1.415,-7.071 0,-1.414 2.829,-1.414 2.829,-1.414 0,0 -0.125,-2.704 1.29,-2.704 1.414,0 1.997,-0.583 6.946,1.538 C 6.988,-1.331 1.414,0 0,0"/></g><g transform="translate(22.4219,12.4062)" id="g24"><path id="path26" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.615,-7.615 -20.152,-13.081 -21.92,-11.313 -1.768,1.767 3.699,14.304 11.313,21.919 7.616,7.616 11.531,7.563 14.85,4.243 C 7.562,11.53 7.615,7.615 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(16.1465,29.46)" id="g36"><path id="path38" style="fill:#d67503;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.292,-4.583 4.583,-6.875 5.729,-8.02 6.875,-9.166 0,-6.875 -2.291,-2.291 -4.583,2.292 0,0 0,0"/></g><g transform="translate(8.6611,21.3887)" id="g40"><path id="path42" style="fill:#d67503;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.292,-4.584 4.583,-6.875 5.728,-8.021 6.874,-9.166 0,-6.875 -2.291,-2.291 -4.582,2.291 0,0 0,0"/></g><g transform="translate(25.209,12.9121)" id="g44"><path id="path46" style="fill:#d67503;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.582,2.291 -6.874,4.582 -8.02,5.728 -9.165,6.875 -6.874,0 -2.291,-2.292 2.292,-4.583 0,0 0,0"/></g><g transform="translate(16.209,4.9121)" id="g48"><path id="path50" style="fill:#d67503;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.582,2.291 -6.874,4.582 -8.02,5.728 -9.166,6.875 -6.874,0 -2.291,-2.292 2.292,-4.583 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M31.096 8.933c3.535-2.122 4.408-8.32 3.701-7.613.707-.707-5.657 0-7.778 3.536 0-1.414-1.414-7.071-3.535-2.121-2.122 4.95-1.415 5.657-1.415 7.071 0 1.414 2.829 1.414 2.829 1.414s-.125 2.704 1.29 2.704c1.414 0 1.997.583 6.946-1.538 4.95-2.122-.624-3.453-2.038-3.453z"/><path fill="#F4900C" d="M22.422 23.594C14.807 31.209 2.27 36.675.502 34.907c-1.768-1.768 3.699-14.305 11.313-21.92 7.615-7.615 11.53-7.562 14.85-4.243 3.319 3.32 3.372 7.235-4.243 14.85z"/><path d="M21.875 14.56c-.972-.972-2.77-2.785-4.692-6.106-.753.492-1.554 1.091-2.409 1.808 2.803 3.613 8.121 5.317 7.101 4.298zm-7.485 8.072c-1.041-1.041-3.03-3.05-5.105-6.846-.687.832-1.349 1.693-1.98 2.57 2.807 3.597 8.101 5.292 7.085 4.276zm9.301-.351c-3.581-2.008-5.49-3.91-6.502-4.921-1.02-1.022.692 4.315 4.317 7.114.311-.29 1.786-1.767 2.185-2.193zm-12.183 9.324c.895-.492 1.804-1.025 2.715-1.597-3.273-1.905-5.069-3.683-6.034-4.648-.922-.923.386 3.347 3.319 6.245z" fill="#D67503"/></svg>
\ No newline at end of file