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/1f6e0.svg b/public/emoji/1f6e0.svg
index f7ac133b5..085f9025e 100644
--- a/public/emoji/1f6e0.svg
+++ b/public/emoji/1f6e0.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(34.2471,29.6758)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.742,-2.743 c 0,0 -1.829,-0.914 -3.657,0.915 C -8.229,0 -7.314,1.829 -7.314,1.829 l 2.743,2.743 c 0.915,0.914 -0.184,1.752 -1.009,1.752 -4.051,0 -7.334,-3.283 -7.334,-7.333 0,-0.57 0.072,-1.121 0.194,-1.654 l -6.199,-6.199 5.485,-5.485 6.2,6.199 c 0.533,-0.123 1.084,-0.194 1.654,-0.194 4.05,0 7.333,3.283 7.333,7.333 C 1.753,-0.179 0.914,0.915 0,0"/></g><g transform="translate(5.7627,4.1621)" id="g24"><path id="path26" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.819,0 -1.482,0.664 -1.482,1.482 0,0.819 0.663,1.483 1.482,1.483 0.819,0 1.482,-0.664 1.482,-1.483 C 1.482,0.664 0.819,0 0,0 M 9.457,16.474 -2.731,4.286 c -1.496,-1.496 -1.496,-3.921 0,-5.417 1.496,-1.495 3.92,-1.495 5.417,0 l 12.187,12.188 -5.416,5.417 z"/></g><g transform="translate(30.8301,2.7207)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.166,-1.166 3.022,-1.221 4.121,-0.121 5.221,0.979 5.166,2.834 4,4 l -23.265,23.266 c -1.166,1.166 -3.021,1.221 -4.121,0.121 -1.1,-1.1 -1.045,-2.955 0.121,-4.121 L 0,0 Z"/></g><g transform="translate(21.4443,35.1074)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -6,3 -11,-2 -4.5,-4.5 -7,-7 -7,-7 0,0 -1,1 -2,0 l -1,-1 c 0,0 -1,-1 0,-2 1,-1 4,-4 4,-4 0,0 1,-1 2,0 l 1,1 c 0,0 1,1 0,2 -0.023,0.023 -0.053,0.053 -0.078,0.078 0.77,0.743 1.923,1.5 3.078,0.922 l 4,4 c 0,0 -1,3 1,5 2,2 3,2 5,2 2,0 1,1 1,1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M34.247 6.324l-2.742 2.743s-1.829.914-3.657-.915c-1.829-1.828-.915-3.657-.915-3.657l2.743-2.743C30.591.838 29.492 0 28.667 0c-4.051 0-7.334 3.283-7.334 7.333 0 .569.072 1.121.194 1.653l-6.199 6.199 5.485 5.485 6.199-6.198c.533.122 1.084.194 1.654.194 4.05 0 7.333-3.283 7.333-7.333.001-.83-.838-1.923-1.752-1.009zm-19.027 9.04L3.031 27.552c-1.495 1.496-1.495 3.921 0 5.417 1.497 1.495 3.921 1.495 5.417 0l12.187-12.188-5.415-5.417zM5.763 31.838c-.819 0-1.482-.664-1.482-1.482s.664-1.483 1.482-1.483c.819 0 1.482.664 1.482 1.483 0 .818-.663 1.482-1.482 1.482z"/><path fill="#F4900C" d="M30.83 33.279c1.166 1.166 3.022 1.221 4.121.121 1.1-1.1 1.045-2.955-.121-4.121L11.565 6.014c-1.167-1.167-3.021-1.221-4.121-.121-1.1 1.1-1.045 2.955.121 4.121L30.83 33.279z"/><path fill="#66757F" d="M21.444.893s-6-3-11 2l-7 7s-1-1-2 0l-1 1s-1 1 0 2l4 4s1 1 2 0l1-1s1-1 0-2l-.078-.078c.77-.743 1.923-1.5 3.078-.922l4-4s-1-3 1-5 3-2 5-2 1-1 1-1z"/></svg>
\ No newline at end of file