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/264b.svg b/public/emoji/264b.svg
index f8f82b780..c5c8b6627 100644
--- a/public/emoji/264b.svg
+++ b/public/emoji/264b.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:#9266cc;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(9.8345,26.7314)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.923,-0.654 -1.556,-1.598 -1.556,-2.731 0,-1.232 1.214,-2.721 2.722,-2.721 1.627,0 2.72,1.407 2.72,2.721 0,1.056 -0.269,1.812 -0.799,2.246 C 2.118,0.31 0.494,0.115 0.478,0.112 0.336,0.083 0.166,0.065 0,0 m 1.166,-8.01 c -2.813,0 -5.281,2.467 -5.281,5.279 0,3.878 3.779,6.279 7.281,6.279 13.633,0 17.006,-6.433 17.144,-6.707 0.316,-0.632 0.06,-1.4 -0.572,-1.716 -0.626,-0.315 -1.39,-0.064 -1.71,0.559 C 17.968,-4.208 15.354,0.36 5.281,0.931 6.054,0.018 6.445,-1.21 6.445,-2.731 6.445,-5.27 4.426,-8.01 1.166,-8.01"/></g><g transform="translate(24.999,14.7207)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.628,0 -2.721,-1.407 -2.721,-2.721 0,-1.055 0.269,-1.811 0.799,-2.247 0.97,-0.794 2.673,-0.599 2.689,-0.596 0.141,0.029 0.234,0.062 0.399,0.112 0.923,0.653 1.556,1.597 1.556,2.731 C 2.722,-1.488 1.508,0 0,0 m -2,-9 c -13.634,0 -17.007,6.434 -17.144,6.707 -0.316,0.632 -0.06,1.4 0.572,1.717 0.627,0.312 1.39,0.062 1.71,-0.56 0.059,-0.108 2.674,-4.676 12.746,-5.247 -0.773,0.913 -1.163,2.141 -1.163,3.662 0,2.539 2.018,5.28 5.279,5.28 2.813,0 5.28,-2.467 5.28,-5.28 C 5.28,-6.6 1.501,-9 -2,-9"/></g><g transform="translate(14.002,24.0103)" id="g32"><path id="path34" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.68 -1.361,3.041 -3.041,3.041 -1.68,0 -3.041,-1.361 -3.041,-3.041 0,-1.68 1.361,-3.041 3.041,-3.041 C -1.361,-3.041 0,-1.68 0,0"/></g><g transform="translate(28.002,12.0098)" id="g36"><path id="path38" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.68 -1.361,3.041 -3.041,3.041 -1.68,0 -3.041,-1.361 -3.041,-3.041 0,-1.68 1.361,-3.041 3.041,-3.041 C -1.361,-3.041 0,-1.68 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" 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 17.279c-2.813 0-5.28-2.467-5.28-5.279 0-3.878 3.779-6.279 7.28-6.279 13.634 0 17.007 6.433 17.145 6.707.315.632.06 1.4-.572 1.716-.626.315-1.39.064-1.71-.559-.06-.108-2.674-4.676-12.747-5.247.773.914 1.164 2.142 1.164 3.663-.001 2.538-2.019 5.278-5.28 5.278zm-1.166-8.01c-.922.653-1.556 1.597-1.556 2.731 0 1.232 1.214 2.721 2.722 2.721 1.627 0 2.721-1.407 2.721-2.72 0-1.056-.269-1.812-.799-2.247-.969-.794-2.593-.6-2.609-.597-.143.028-.313.046-.479.112zm13.165 21.01c-13.634 0-17.007-6.434-17.144-6.707-.316-.632-.06-1.4.572-1.717.627-.312 1.391-.062 1.71.56.06.108 2.674 4.677 12.746 5.247-.773-.913-1.163-2.141-1.163-3.662 0-2.539 2.019-5.279 5.279-5.279 2.812 0 5.28 2.467 5.28 5.279 0 3.879-3.779 6.279-7.28 6.279zm2-9c-1.628 0-2.721 1.407-2.721 2.721 0 1.056.269 1.812.799 2.247.97.794 2.673.6 2.688.597.142-.029.234-.062.399-.112.923-.653 1.556-1.598 1.556-2.731.001-1.233-1.213-2.722-2.721-2.722z"/><path fill="#9266CC" d="M14.002 11.99c0-1.68-1.361-3.041-3.041-3.041S7.92 10.31 7.92 11.99s1.361 3.041 3.041 3.041 3.041-1.362 3.041-3.041zm14 12c0-1.68-1.361-3.041-3.041-3.041S21.92 22.31 21.92 23.99s1.361 3.041 3.041 3.041 3.041-1.361 3.041-3.041z"/></svg>
\ No newline at end of file