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/1f4af.svg b/public/emoji/1f4af.svg
index 80a08e016..3d565cc64 100644
--- a/public/emoji/1f4af.svg
+++ b/public/emoji/1f4af.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(1.7275,15)" id="g20"><path id="path22" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.617,0 -0.953,0.256 -1.127,0.471 -0.171,0.211 -0.348,0.585 -0.225,1.165 l 2.728,12.706 -1.714,-0.097 -0.013,0 c -0.516,0 -0.892,0.167 -1.127,0.458 -0.219,0.272 -0.298,0.621 -0.221,0.981 0.151,0.701 0.883,1.285 1.668,1.329 l 4.008,0.227 c 0.077,0.005 0.149,0.008 0.216,0.008 0.147,0 0.536,0 0.784,-0.307 0.252,-0.312 0.166,-0.709 0.138,-0.839 L 1.991,1.546 C 1.804,0.662 1.072,0.057 0.125,0.004 L 0,0 Z"/></g><g transform="translate(15.8853,30.7456)" id="g24"><path id="path26" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.137,-0.004 c -1.94,-0.111 -3.555,-2.304 -4.32,-5.866 -0.477,-2.228 -0.38,-3.899 0.273,-4.707 0.297,-0.368 0.717,-0.554 1.249,-0.554 l 0.14,0.004 c 1.94,0.109 3.554,2.301 4.318,5.863 0.479,2.229 0.383,3.901 -0.27,4.708 C 0.956,-0.187 0.534,0 0,0 m -3.414,-13.746 c -1.439,0 -2.635,0.54 -3.459,1.559 -1.163,1.438 -1.467,3.651 -0.878,6.396 1.032,4.812 4.207,8.186 7.902,8.395 1.59,0.09 2.906,-0.452 3.793,-1.549 1.163,-1.439 1.467,-3.651 0.878,-6.397 -1.032,-4.81 -4.209,-8.184 -7.904,-8.394 -0.112,-0.007 -0.223,-0.01 -0.332,-0.01"/></g><g transform="translate(30.8867,32.3862)" id="g28"><path id="path30" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.136,-0.004 c -1.94,-0.111 -3.555,-2.304 -4.32,-5.865 -0.478,-2.228 -0.381,-3.901 0.272,-4.708 0.297,-0.368 0.719,-0.555 1.251,-0.555 l 0.14,0.004 c 1.939,0.109 3.554,2.301 4.318,5.864 0.48,2.227 0.383,3.899 -0.269,4.707 C 0.957,-0.187 0.535,0 0,0 m -3.411,-13.747 c -1.44,0 -2.637,0.539 -3.462,1.56 -1.163,1.439 -1.467,3.651 -0.878,6.397 1.033,4.813 4.209,8.186 7.903,8.394 1.603,0.09 2.904,-0.453 3.79,-1.549 1.163,-1.44 1.467,-3.652 0.878,-6.397 -1.031,-4.809 -4.206,-8.183 -7.902,-8.396 -0.111,-0.008 -0.221,-0.009 -0.329,-0.009"/></g><g transform="translate(11.0005,0.999)" id="g32"><path id="path34" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.81,0 -1.572,0.496 -1.873,1.299 -0.388,1.034 0.136,2.186 1.17,2.575 0.338,0.126 8.4,3.108 20.536,4.12 1.102,0.096 2.068,-0.726 2.16,-1.827 C 22.085,5.066 21.266,4.1 20.165,4.008 8.576,3.042 0.779,0.157 0.702,0.128 0.471,0.042 0.233,0 0,0"/></g><g transform="translate(2.0015,7)" id="g36"><path id="path38" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.804,0 -1.562,0.488 -1.868,1.283 -0.396,1.031 0.118,2.188 1.149,2.583 0.542,0.209 13.515,5.126 32.612,6.131 1.113,0.069 2.045,-0.789 2.103,-1.892 C 34.054,7.002 33.207,6.061 32.104,6.003 13.681,5.033 0.843,0.182 0.715,0.133 0.48,0.043 0.238,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BB1A34" d="M1.728 21c-.617 0-.953-.256-1.127-.471-.171-.211-.348-.585-.225-1.165L3.104 6.658l-1.714.097h-.013c-.517 0-.892-.168-1.127-.459-.22-.272-.299-.621-.221-.98.15-.702.883-1.286 1.667-1.329l4.008-.227c.078-.005.15-.008.217-.008.147 0 .536 0 .783.306.252.312.167.709.139.839L3.719 19.454c-.187.884-.919 1.489-1.866 1.542L1.728 21zm10.743-2c-1.439 0-2.635-.539-3.459-1.559-1.163-1.439-1.467-3.651-.878-6.397 1.032-4.812 4.208-8.186 7.902-8.395 1.59-.089 2.906.452 3.793 1.549 1.163 1.439 1.467 3.651.878 6.397-1.032 4.81-4.208 8.184-7.904 8.394-.112.008-.223.011-.332.011zm3.414-13.746l-.137.004c-1.94.111-3.555 2.304-4.32 5.866-.478 2.228-.381 3.899.272 4.707.297.368.717.555 1.249.555l.14-.004c1.94-.109 3.554-2.301 4.318-5.864.478-2.228.382-3.9-.27-4.708-.296-.369-.718-.556-1.252-.556zm11.591 12.107c-1.439 0-2.637-.539-3.462-1.56-1.163-1.439-1.467-3.651-.878-6.397 1.033-4.813 4.209-8.186 7.903-8.394 1.603-.09 2.903.453 3.79 1.549 1.163 1.439 1.467 3.651.878 6.396-1.031 4.809-4.206 8.183-7.902 8.396-.112.008-.221.01-.329.01zm3.411-13.747l-.136.004c-1.941.111-3.556 2.304-4.32 5.865-.478 2.229-.381 3.901.272 4.708.297.368.719.555 1.251.555l.14-.004c1.939-.109 3.554-2.302 4.318-5.864.479-2.227.383-3.899-.27-4.707-.298-.37-.72-.557-1.255-.557zM11 35.001c-.81 0-1.572-.496-1.873-1.299-.388-1.034.136-2.187 1.17-2.575.337-.126 8.399-3.108 20.536-4.12 1.101-.096 2.067.727 2.159 1.827.092 1.101-.727 2.067-1.827 2.159-11.59.966-19.386 3.851-19.464 3.88-.23.086-.468.128-.701.128zM2.001 29c-.804 0-1.563-.488-1.868-1.283-.396-1.031.118-2.188 1.149-2.583.542-.209 13.516-5.126 32.612-6.131 1.113-.069 2.045.789 2.103 1.892.059 1.103-.789 2.045-1.892 2.103-18.423.97-31.261 5.821-31.389 5.87-.235.089-.477.132-.715.132z"/></svg>
\ No newline at end of file