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/1f686.svg b/public/emoji/1f686.svg
index 647ab0815..3f5f5b856 100644
--- a/public/emoji/1f686.svg
+++ b/public/emoji/1f686.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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" 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 transform="translate(12.9996,17.0001)" id="g12"><path id="path14" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11,-17 32.001,0 -11,17 L 0,0 Z"/></g><g transform="translate(15.0003,17.0001)" id="g16"><path id="path18" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,-17 25.999,0 -10,17 L 0,0 Z"/></g><g transform="translate(17.0001,17.0001)" id="g20"><path id="path22" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -9,-17 11,-17 2,0 0,0 Z"/></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(28,1)" id="g32"><path id="path34" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -18,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(26,5)" id="g36"><path id="path38" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -14,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(27.0762,10.7002)" id="g40"><path id="path42" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.076,6.3 -10,0 -4.076,-6.3 c 1.888,-2.517 4.798,-4.699 9.076,-4.699 4.277,0 7.187,2.182 9.076,4.699"/></g><g transform="translate(18,36)" id="g44"><path id="path46" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9,0 -12,-3 -12,-9 l 0,-7.999 c 0,-2 3,-11.001 12,-11.001 9,0 12,9.001 12,11.001 L 12,-9 C 12,-3 9,0 0,0"/></g><g transform="translate(8,25.0005)" id="g48"><path id="path50" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,9 4.477,10 10,10 15.523,10 20,9 20,0 20,-6 15.523,-10.999 10,-10.999 4.477,-10.999 0,-6 0,0"/></g><g transform="translate(18,14.001)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.642,0 3.186,0.45 4.553,1.227 3.77,2.27 2.03,2.999 0,2.999 -2.03,2.999 -3.769,2.27 -4.552,1.227 -3.186,0.45 -1.641,0 0,0"/></g><g transform="translate(19,31.0029)" id="g56"><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4.965 c 3.488,0.232 6,1.62 6,2.463 l 0,1.666 C 6,-0.044 2.308,0.002 0,0"/></g><g transform="translate(17,31.0029)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.308,0.002 -6,-0.044 -6,-0.836 l 0,-1.666 c 0,-0.843 2.512,-2.231 6,-2.463 L 0,0 Z"/></g><g transform="translate(6,26.0005)" id="g64"><path id="path66" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-3 4,-9 0,0 -4,2 -4,6 l 0,3 z"/></g><g transform="translate(30,26.0005)" id="g68"><path id="path70" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-3 -4,-9 0,0 4,2 4,6 l 0,3 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#A7A9AC" d="M2 36h32L23 19H13z"/><path fill="#58595B" d="M5 36h26L21 19h-6z"/><path fill="#808285" d="M8 36h20l-9-17h-2z"/><path fill="#A7A9AC" d="M28 35c0 .553-.447 1-1 1H9c-.552 0-1-.447-1-1 0-.553.448-1 1-1h18c.553 0 1 .447 1 1zm-2-4c0 .553-.447 1-1 1H11c-.552 0-1-.447-1-1 0-.553.448-1 1-1h14c.553 0 1 .447 1 1z"/><path fill="#58595B" d="M27.076 25.3L23 19H13l-4.076 6.3c1.889 2.517 4.798 4.699 9.076 4.699 4.277 0 7.188-2.183 9.076-4.699z"/><path fill="#A7A9AC" d="M18 0C9 0 6 3 6 9v8c0 1.999 3 11 12 11s12-9.001 12-11V9c0-6-3-9-12-9z"/><path fill="#E6E7E8" d="M8 11C8 2 12.477 1 18 1s10 1 10 10c0 6-4.477 11-10 11-5.523-.001-10-5-10-11z"/><path fill="#FFAC33" d="M18 21.999c1.642 0 3.185-.45 4.553-1.228C21.77 19.729 20.03 19 18 19s-3.769.729-4.552 1.772c1.366.777 2.911 1.227 4.552 1.227z"/><path d="M19 4.997v4.965c3.488-.232 6-1.621 6-2.463V5.833c0-.791-3.692-.838-6-.836zm-2 0c-2.308-.002-6 .044-6 .836V7.5c0 .842 2.512 2.231 6 2.463V4.997z" fill="#55ACEE"/><path fill="#269" d="M6 10s0 3 4 9c0 0-4-2-4-6v-3zm24 0s0 3-4 9c0 0 4-2 4-6v-3z"/></svg>
\ No newline at end of file