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/1f44c.svg b/public/emoji/1f44c.svg
index 3ccac8265..bf82d1aaf 100644
--- a/public/emoji/1f44c.svg
+++ b/public/emoji/1f44c.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(24.9971,7.5)" id="g20"><path id="path22" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.185,0 -2.237,0.846 -2.457,2.053 l -4,22 c -0.247,1.358 0.654,2.66 2.013,2.906 1.358,0.252 2.66,-0.653 2.907,-2.012 l 4,-22 C 2.71,1.589 1.809,0.287 0.45,0.04 0.299,0.013 0.148,0 0,0"/></g><g transform="translate(28.375,11.2354)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.239,0.745 0.13,1.591 -0.375,2.265 -0.059,0.078 -0.439,0.585 -1.017,1.339 0.005,0.052 0.017,0.113 0.017,0.161 0,0.458 -1.913,2.623 -3.74,4.586 -1.587,1.964 -3.261,3.95 -4.492,5.181 L -10.881,14.807 -12.493,14 c -5.718,-2.858 -8.647,-3.855 -8.673,-3.864 -1.31,-0.436 -2.017,-1.852 -1.581,-3.162 0.437,-1.31 1.852,-2.015 3.163,-1.581 0.117,0.039 2.666,0.899 7.649,3.31 1.095,-1.23 2.378,-2.795 3.575,-4.296 L -7.656,3.233 C -7.487,2.951 -7.511,2.595 -7.717,2.338 l -3.513,-4.392 c -0.095,-0.119 -0.222,-0.207 -0.365,-0.255 l -2.531,-0.843 c -0.162,-0.054 -0.336,-0.054 -0.498,0 l -4.729,1.576 c -0.676,2.082 -0.533,4.102 -0.531,4.124 0.119,1.376 -0.899,2.588 -2.275,2.707 -1.372,0.128 -2.587,-0.898 -2.707,-2.274 -0.022,-0.26 -0.51,-6.423 3.313,-10.593 2.208,-2.409 5.296,-3.63 9.178,-3.63 0.66,0 1.283,-0.009 1.871,-0.018 0.529,-0.008 1.042,-0.015 1.537,-0.015 2.764,0 5.004,0.231 6.738,1.941 1.65,1.626 2.354,4.195 2.354,8.592 C 0.125,-0.481 0.074,-0.236 0,0"/></g><g transform="translate(27.001,15)" id="g28"><path id="path30" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.384,0 -0.749,0.221 -0.915,0.594 l -4,9 c -0.224,0.505 0.003,1.095 0.508,1.32 0.506,0.226 1.095,-0.003 1.32,-0.508 l 4,-9 C 1.137,0.901 0.91,0.311 0.405,0.086 0.273,0.027 0.136,0 0,0"/></g><g transform="translate(24.7656,1.6201)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.531,4.76 c 0,0 -0.067,-0.011 -0.175,-0.067 0.018,0.009 1.821,0.995 2.461,6.003 0.775,6.075 -0.775,9.6 -0.79,9.635 l -0.093,0.23 -3.5,10.105 c -0.452,1.304 0.239,2.728 1.544,3.18 1.303,0.451 2.729,-0.24 3.181,-1.544 L 4.566,22.29 C 4.942,21.403 6.601,17.004 5.714,10.063 4.672,1.9 0.771,0.248 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M24.997 28.5c-1.185 0-2.237-.846-2.457-2.053l-4-22c-.247-1.358.654-2.66 2.012-2.907 1.358-.251 2.66.654 2.907 2.012l4 22c.247 1.358-.654 2.66-2.013 2.907-.15.028-.3.041-.449.041z"/><path fill="#FFDC5D" d="M28.375 24.765c.239-.745.13-1.591-.375-2.265-.059-.078-.44-.585-1.017-1.34.005-.052.017-.112.017-.16 0-.458-1.913-2.623-3.74-4.586-1.587-1.965-3.261-3.951-4.492-5.182l-1.274-1.274-1.612.806c-5.718 2.859-8.647 3.855-8.672 3.864-1.31.437-2.018 1.852-1.581 3.162.437 1.31 1.852 2.015 3.162 1.582.117-.039 2.666-.899 7.65-3.311 1.094 1.23 2.378 2.795 3.574 4.296l.704 1.174c.169.282.146.639-.061.896l-3.513 4.392c-.095.119-.222.207-.365.255l-2.531.844c-.161.054-.336.054-.497 0l-4.73-1.576c-.676-2.082-.533-4.102-.531-4.124.12-1.376-.899-2.588-2.274-2.707-1.372-.128-2.587.897-2.707 2.273-.022.261-.51 6.424 3.313 10.594 2.208 2.408 5.296 3.63 9.178 3.63.66 0 1.283.009 1.871.018.529.008 1.042.016 1.537.016 2.764 0 5.004-.231 6.738-1.941 1.649-1.626 2.354-4.195 2.354-8.592-.001-.263-.052-.508-.126-.744z"/><path fill="#EF9645" d="M27.001 21c-.384 0-.749-.221-.915-.594l-4-9c-.224-.505.003-1.096.508-1.32.506-.226 1.096.003 1.32.507l4 9c.224.505-.003 1.096-.508 1.32-.132.06-.269.087-.405.087z"/><path fill="#FFDC5D" d="M24.766 34.38l-1.531-4.76s-.066.011-.175.066c.017-.009 1.821-.995 2.461-6.003.775-6.075-.774-9.6-.79-9.634l-.093-.231-3.5-10.104c-.452-1.305.239-2.729 1.544-3.181 1.303-.451 2.729.24 3.181 1.544l3.469 10.013c.377.887 2.035 5.285 1.148 12.226-1.042 8.163-4.943 9.816-5.714 10.064z"/></svg>
\ No newline at end of file