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/1f69d.svg b/public/emoji/1f69d.svg
index f7cd69eea..64ab140c5 100644
--- a/public/emoji/1f69d.svg
+++ b/public/emoji/1f69d.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="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" 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"><path id="path12" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,8 36,8 36,12 0,12 0,8 Z"/><path id="path14" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,10 36,0 0,4.001 -36,0 L 0,10 Z"/><path id="path16" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 6,0 10,0 10,8 6,8 6,0 Z"/><path id="path18" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,0 4,0 0,8 -4,0 0,-8 z"/><path id="path20" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,0 4,0 0,8 -4,0 0,-8 z"/><path id="path22" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,6 6,6 6,9 10,9 10,6 Z"/><path id="path24" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,6 -4,0 0,3 4,0 0,-3 z"/><path id="path26" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,6 -4,0 0,3 4,0 0,-3 z"/><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(36,36)" id="g36"><path id="path38" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-2 c 0,-1.104 0.896,-2 2,-2 l 6,0 0,6 z"/></g><g transform="translate(36,16)" id="g40"><path id="path42" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-5 -18,0 c -3.001,0 -7.001,5 -7.001,5 L 0,0 Z"/></g><g transform="translate(10.9995,16)" id="g44"><path id="path46" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.751,-0.937 1.844,-2 l 23.157,0 0,2 L 0,0 Z"/></g><g transform="translate(36,16)" id="g48"><path id="path50" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -26,0 c -3,0 -7,3.001 -7,6.001 0,5 15.999,11.999 18,11.999 L 0,18 0,0 Z"/></g><g transform="translate(3.7412,24)" id="g52"><path id="path54" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,-0.686 -0.742,-1.36 -0.742,-1.999 0,-1.656 1.221,-3.309 2.816,-4.46 15.416,4.459 30.185,4.46 30.185,4.46 L 32.259,0 0,0 Z"/></g><g transform="translate(21,32)" id="g56"><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.553,0 c -3.327,-1.524 -7.344,-3.738 -9.899,-6 L 0,-6 c 1.105,0 2,0.896 2,2 l 0,2 C 2,-0.896 1.105,0 0,0"/></g><g transform="translate(26,27)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 l 0,4 c 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(34,27)" id="g64"><path id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -4,0 c -0.553,0 -1,0.448 -1,1 l 0,4 c 0,0.552 0.447,1 1,1 l 4,0 C -0.447,5 0,4.552 0,4 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#6D6E71" d="M0 24h36v4H0z"/><path fill="#939598" d="M0 22h36v4H0zm6 6h4v8H6zm10 0h4v8h-4zm10 0h4v8h-4z"/><path fill="#6D6E71" d="M6 27h4v3H6zm10 0h4v3h-4zm10 0h4v3h-4z"/><path fill="#BCBEC0" d="M36 0h-6c-1.104 0-2 .896-2 2v2c0 1.104.896 2 2 2h6V0z"/><path fill="#D1D3D4" d="M36 20v5H18c-3 0-7-5-7-5h25z"/><path fill="#BCBEC0" d="M11 20s.751.938 1.844 2H36v-2H11z"/><path fill="#E6E7E8" d="M36 20H10c-3 0-7-3-7-6C3 9 19 2 21 2h15v18z"/><path fill="#5C913B" d="M3.741 12C3.28 12.686 3 13.36 3 14c0 1.655 1.22 3.308 2.816 4.459C21.231 14 36 14 36 14v-2H3.741z"/><path fill="#55ACEE" d="M21 4h-5.553c-3.327 1.524-7.344 3.738-9.898 6H21c1.104 0 2-.896 2-2V6c0-1.104-.896-2-2-2zm5 5c0 .552-.447 1-1 1-.553 0-1-.448-1-1V5c0-.552.447-1 1-1 .553 0 1 .448 1 1v4zm8 0c0 .552-.447 1-1 1h-4c-.553 0-1-.448-1-1V5c0-.552.447-1 1-1h4c.553 0 1 .448 1 1v4z"/></svg>
\ No newline at end of file