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/1f44e.svg b/public/emoji/1f44e.svg
index 05c5a1f97..1569ad098 100644
--- a/public/emoji/1f44e.svg
+++ b/public/emoji/1f44e.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,17.126)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.861,15.271 -2.941,15.824 -0.256,1.78 -2.057,3.078 -4.243,3.049 0,0 -11.774,0.002 -17.774,0.002 -6,0 -6.042,-2.308 -6.042,-7.85 l 0.08,-13.555 c -0.023,-0.537 -0.038,-1.078 -0.038,-1.57 0,-2 3,-7.001 3,-10.501 0,-2.5 1.021,-2.5 3.521,-2.5 1.933,0 2.51,3 2.51,5.5 0,1.041 -0.65,3.667 -1.207,5.728 l 16.218,0.772 C -0.167,-4.892 0.458,-2.225 0,0"/></g><g transform="translate(32.9199,20.7661)" id="g24"><path id="path26" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.516,0.295 -10.509,-0.517 -14.409,-0.852 -0.025,0.013 -0.042,0.034 -0.068,0.044 -0.057,0.023 -1.391,0.564 -1.444,1.859 -0.043,1.072 0.502,1.735 0.788,2.008 l 13.528,0.87 c 0.55,0.036 0.968,0.511 0.933,1.062 -0.036,0.551 -0.496,0.981 -1.062,0.934 L -13.412,5.174 c -0.815,0.501 -1.74,1.25 -1.754,2.079 -0.012,0.794 0.786,1.57 1.269,1.938 l 10.935,0.445 c 0.552,0.023 0.981,0.488 0.958,1.04 -0.022,0.552 -0.459,0.976 -1.04,0.958 l -10.528,-0.428 c -0.041,0.012 -0.076,0.037 -0.12,0.043 -0.371,0.054 -0.588,0.217 -0.704,0.529 -0.182,0.487 -0.036,1.124 0.214,1.413 0.088,0.101 0.123,0.094 0.136,0.091 0.54,-0.116 1.072,0.227 1.188,0.767 0.116,0.54 -0.228,1.072 -0.768,1.188 -0.764,0.164 -1.521,-0.105 -2.069,-0.738 -0.761,-0.88 -0.997,-2.287 -0.575,-3.42 0.122,-0.328 0.311,-0.603 0.527,-0.852 -0.675,-0.661 -1.439,-1.691 -1.423,-2.994 0.011,-0.857 0.362,-1.662 1.033,-2.41 -0.309,-0.223 -1.883,-1.476 -1.786,-3.854 0.041,-1.01 0.439,-1.772 0.918,-2.335 -0.988,-0.52 -2,-1.582 -1.832,-3.464 0.112,-1.243 0.555,-2.163 1.316,-2.734 0.636,-0.476 1.321,-0.572 1.768,-0.572 0.181,0 0.323,0.015 0.407,0.028 L -2.09,-7.04 c 0.551,0.044 0.961,0.527 0.917,1.077 -0.044,0.549 -0.511,0.951 -1.077,0.917 L -15.635,-6.13 c -0.006,0 -0.397,-0.058 -0.694,0.175 -0.351,0.275 -0.472,0.861 -0.511,1.303 -0.119,1.32 0.924,1.632 1.191,1.687 1.735,0.224 14.164,1.082 15.087,1.102 0.361,-0.013 0.727,0.158 0.923,0.496 C 0.64,-0.89 0.478,-0.278 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDB5E" d="M34.956 18.084c0 .503-.12.975-.321 1.404-1.341 4.326-7.619 4.01-16.549 4.221-1.493.035-.639 1.798-.115 5.668.341 2.517-1.282 6.382-4.01 6.382-4.498 0-.171-3.548-4.148-12.322-2.125-4.688-6.875-2.062-6.875-6.771V5.948c0-1.833.18-3.595 2.758-3.885C8.195 1.781 7.633 0 11.238 0h18.044c1.838 0 3.333 1.496 3.333 3.334 0 .762-.267 1.456-.698 2.018 1.02.571 1.72 1.649 1.72 2.899 0 .76-.266 1.454-.696 2.015 1.023.57 1.725 1.649 1.725 2.901 0 .909-.368 1.733-.961 2.336.757.611 1.251 1.535 1.251 2.581z"/><path fill="#EE9547" d="M23.02 14.751h8.604c1.17 0 2.268.626 2.866 1.633.246.415.109.952-.307 1.199-.415.247-.952.108-1.199-.307-.283-.479-.806-.775-1.361-.775h-8.81c-.873 0-1.583.71-1.583 1.583s.71 1.583 1.583 1.583H28.7c.483 0 .875.392.875.875s-.392.875-.875.875h-5.888c-1.838 0-3.333-1.495-3.333-3.333 0-1.025.475-1.932 1.205-2.544-.615-.605-.998-1.445-.998-2.373 0-1.028.478-1.938 1.212-2.549-.611-.604-.99-1.441-.99-2.367 0-1.12.559-2.108 1.409-2.713-.524-.589-.852-1.356-.852-2.204 0-1.838 1.495-3.333 3.333-3.333h5.484c1.17 0 2.269.625 2.867 1.632.247.415.11.952-.305 1.199-.416.245-.953.11-1.199-.305-.285-.479-.808-.776-1.363-.776h-5.484c-.873 0-1.583.71-1.583 1.583s.71 1.583 1.583 1.583h6.506c1.17 0 2.27.626 2.867 1.633.247.416.11.953-.305 1.199-.419.251-.954.11-1.199-.305-.289-.487-.799-.777-1.363-.777h-7.063c-.873 0-1.583.711-1.583 1.584s.71 1.583 1.583 1.583h8.091c1.17 0 2.269.625 2.867 1.632.247.415.11.952-.305 1.199-.417.246-.953.11-1.199-.305-.289-.486-.799-.776-1.363-.776H23.02c-.873 0-1.583.71-1.583 1.583s.709 1.584 1.583 1.584z"/></svg>
\ No newline at end of file