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/1f237.svg b/public/emoji/1f237.svg
index a0590d6a3..459d94886 100644
--- a/public/emoji/1f237.svg
+++ b/public/emoji/1f237.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(36,4)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(24.6572,26.2788)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.52 -0.261,0.676 -0.806,0.676 l -10.634,0 c -0.52,0 -0.832,-0.156 -0.832,-0.676 l 0,-3.432 L 0,-3.432 0,0 Z m -12.272,-5.382 c -0.027,-1.456 -0.027,-2.938 -0.183,-4.395 l 12.455,0 0,4.395 -12.272,0 z m -0.416,-6.344 c -0.469,-3.276 -1.457,-5.877 -3.329,-8.035 -0.234,-0.26 -0.545,-0.39 -0.858,-0.39 -0.26,0 -0.52,0.078 -0.754,0.26 -0.286,0.208 -0.416,0.52 -0.416,0.806 0,0.234 0.104,0.494 0.286,0.703 2.861,3.119 3.432,7.227 3.432,14.534 l 0,4.238 c 0,1.586 0.78,2.236 2.341,2.236 l 11.7,0 c 1.534,0 2.314,-0.65 2.314,-2.236 l 0,-17.889 c 0,-1.69 -0.702,-2.444 -3.354,-2.444 -1.015,0 -2.002,0.104 -2.834,0.286 -0.494,0.104 -0.806,0.416 -0.806,0.936 0,0.078 0,0.182 0.026,0.286 0.129,0.546 0.468,0.78 0.832,0.78 0.078,0 0.156,0 0.234,-0.026 0.676,-0.182 1.482,-0.285 2.288,-0.285 1.352,0 1.586,0.207 1.586,1.039 l 0,5.201 -12.688,0 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M11.969 21.447c-.468 3.276-1.456 5.877-3.328 8.035-.234.26-.546.39-.858.39-.26 0-.52-.078-.754-.26-.286-.208-.416-.521-.416-.807 0-.233.104-.493.286-.702 2.86-3.119 3.432-7.228 3.432-14.534V9.331c0-1.586.78-2.236 2.34-2.236h11.7c1.534 0 2.314.65 2.314 2.236V27.22c0 1.691-.702 2.444-3.354 2.444-1.015 0-2.002-.104-2.834-.286-.494-.103-.806-.416-.806-.935 0-.078 0-.183.025-.286.13-.546.469-.78.832-.78.078 0 .156 0 .234.026.676.182 1.482.285 2.288.285 1.352 0 1.586-.207 1.586-1.039v-5.201H11.969zm.416-6.343c-.026 1.456-.026 2.938-.182 4.394h12.455v-4.394H12.385zm12.272-5.383c0-.52-.261-.676-.806-.676H13.217c-.52 0-.832.156-.832.676v3.432h12.272V9.721z"/></svg>
\ No newline at end of file