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/3299.svg b/public/emoji/3299.svg
index ffe9e7757..d1a793379 100644
--- a/public/emoji/3299.svg
+++ b/public/emoji/3299.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,18)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.94 -8.059,-18 -18,-18 -9.941,0 -18,8.06 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(27.9023,20.9565)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.378,0 0.702,-0.216 0.892,-0.648 0.917,-1.943 1.51,-3.914 1.943,-5.911 0.026,-0.136 0.054,-0.27 0.054,-0.378 0,-0.432 -0.19,-0.756 -0.675,-0.918 -0.135,-0.027 -0.27,-0.054 -0.405,-0.054 -0.405,0 -0.729,0.244 -0.864,0.81 -0.431,1.781 -1.052,3.914 -1.863,5.695 -0.08,0.136 -0.107,0.297 -0.107,0.459 0,0.351 0.189,0.675 0.567,0.837 C -0.297,-0.027 -0.135,0 0,0 m -4.453,6.64 c 0.297,-0.27 0.485,-0.594 0.485,-0.917 0,-0.189 -0.053,-0.378 -0.188,-0.54 -0.217,-0.297 -0.567,-0.459 -0.918,-0.459 -0.27,0 -0.513,0.081 -0.701,0.243 -1.108,0.917 -2.944,2.105 -4.401,2.807 -0.297,0.189 -0.486,0.486 -0.486,0.81 0,0.162 0.054,0.351 0.162,0.513 0.216,0.35 0.567,0.512 0.918,0.512 0.189,0 0.378,-0.053 0.567,-0.134 C -7.504,8.8 -5.587,7.639 -4.453,6.64 m -7.153,-6.289 c 0.053,0 0.107,0 0.189,-0.027 0.567,-0.081 0.837,-0.432 0.837,-0.918 0,-0.081 0,-0.162 -0.028,-0.243 -0.27,-2.483 -0.864,-5.102 -1.7,-7.072 -0.216,-0.405 -0.567,-0.621 -0.945,-0.621 -0.135,0 -0.297,0.028 -0.432,0.109 -0.378,0.161 -0.54,0.431 -0.54,0.756 0,0.188 0.054,0.377 0.162,0.593 0.81,1.863 1.35,4.238 1.62,6.64 0.054,0.513 0.351,0.783 0.837,0.783 m 2.294,3.077 c 0,0.486 0.405,0.783 1.026,0.783 0.566,0 0.972,-0.297 0.972,-0.81 l 0,-9.231 c 2.699,3.59 4.587,8.07 5.83,13.307 0.108,0.459 0.405,0.729 0.918,0.729 0.081,0 0.188,0 0.324,-0.027 0.539,-0.108 0.863,-0.54 0.863,-0.972 0,-0.108 0,-0.189 -0.026,-0.27 -1.782,-6.559 -4.482,-11.85 -7.909,-15.71 l 0,-2.725 c 0,-0.649 0.189,-0.919 0.863,-0.999 0.459,-0.054 1.025,-0.082 1.863,-0.082 0.836,0 1.457,0.082 1.916,0.189 0.54,0.136 0.837,0.324 0.998,0.892 0.162,0.566 0.298,1.565 0.324,2.806 0.028,0.432 0.406,0.81 1,0.81 l 0.053,0 C 0.324,-7.909 0.621,-8.26 0.621,-8.854 l 0,-0.081 c -0.054,-1.511 -0.243,-2.807 -0.566,-3.697 -0.325,-0.918 -0.999,-1.486 -2.106,-1.701 -0.702,-0.135 -1.539,-0.189 -2.537,-0.216 -1.08,0 -1.971,0.053 -2.673,0.135 -1.43,0.189 -2.051,0.836 -2.051,2.213 l 0,1.944 c -1.323,-1.215 -2.807,-2.349 -4.373,-3.293 -0.243,-0.162 -0.486,-0.243 -0.702,-0.243 -0.323,0 -0.621,0.162 -0.782,0.512 -0.136,0.162 -0.189,0.378 -0.189,0.568 0,0.35 0.162,0.701 0.539,0.918 2.025,1.132 3.861,2.618 5.507,4.291 l 0,10.932 z m -4.589,-0.54 c 0.486,0 0.756,-0.351 0.756,-0.89 0,-0.567 -0.27,-0.945 -0.756,-0.945 l -2.456,0 c 0.621,-1.431 1.511,-2.726 2.483,-3.698 0.189,-0.189 0.297,-0.486 0.297,-0.756 0,-0.243 -0.081,-0.459 -0.216,-0.621 -0.162,-0.188 -0.378,-0.297 -0.62,-0.297 -0.244,0 -0.541,0.135 -0.73,0.378 -0.54,0.702 -1.16,1.862 -1.619,3.104 0.162,-1.403 0.297,-2.915 0.297,-4.102 l 0,-9.61 c 0,-0.513 -0.351,-0.81 -0.972,-0.81 -0.594,0 -0.917,0.297 -0.917,0.81 l 0,8.907 c 0,1.404 0.215,2.943 0.404,4.211 -0.674,-2.24 -1.808,-5.047 -3.185,-6.937 -0.216,-0.296 -0.513,-0.459 -0.837,-0.459 -0.189,0 -0.378,0.054 -0.54,0.189 -0.27,0.217 -0.404,0.486 -0.404,0.783 0,0.216 0.081,0.432 0.243,0.647 1.835,2.295 3.266,5.481 3.994,8.261 l -2.915,0 c -0.486,0 -0.756,0.378 -0.756,0.945 0,0.539 0.27,0.89 0.756,0.89 l 3.24,0 0,3.51 c -0.837,-0.189 -1.701,-0.352 -2.484,-0.459 -0.054,-0.027 -0.108,-0.027 -0.189,-0.027 -0.459,0 -0.81,0.269 -0.891,0.836 l 0,0.162 c 0,0.486 0.297,0.837 0.729,0.918 2.213,0.297 4.643,0.945 6.262,1.781 0.217,0.108 0.432,0.163 0.648,0.163 0.351,0 0.648,-0.189 0.864,-0.486 0.135,-0.189 0.189,-0.378 0.189,-0.567 0,-0.324 -0.189,-0.594 -0.54,-0.756 -0.755,-0.378 -1.7,-0.729 -2.699,-1.053 l 0,-4.022 2.564,0 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M36 18c0 9.94-8.059 18-18 18S0 27.94 0 18C0 8.059 8.059 0 18 0s18 8.059 18 18z"/><path fill="#FFF" d="M14.002 12.155c.486 0 .756.351.756.891 0 .567-.27.945-.756.945h-2.457c.621 1.431 1.512 2.726 2.483 3.698.189.189.297.486.297.755 0 .243-.081.459-.216.621-.162.189-.378.297-.621.297s-.54-.135-.729-.378c-.54-.702-1.161-1.862-1.62-3.104.162 1.403.297 2.915.297 4.102v9.61c0 .513-.351.809-.972.809-.594 0-.917-.297-.917-.809v-8.907c0-1.404.216-2.943.405-4.211-.675 2.24-1.809 5.047-3.185 6.937-.216.297-.513.459-.837.459-.189 0-.378-.054-.54-.188-.27-.217-.405-.486-.405-.783 0-.216.081-.432.243-.647 1.835-2.295 3.266-5.48 3.995-8.26H6.309c-.486 0-.756-.378-.756-.945 0-.54.27-.891.756-.891h3.239v-3.51c-.837.189-1.701.351-2.484.459-.054.027-.107.027-.189.027-.459 0-.81-.27-.891-.836v-.162c0-.486.297-.837.729-.918 2.213-.297 4.643-.944 6.262-1.781.216-.108.432-.162.648-.162.351 0 .648.189.864.486.135.189.189.378.189.567 0 .324-.189.594-.54.756-.755.378-1.7.729-2.699 1.053v4.022h2.565zm4.588-.54c0-.486.405-.783 1.026-.783.566 0 .972.297.972.81v9.231c2.699-3.59 4.588-8.071 5.83-13.308.108-.459.405-.729.918-.729.081 0 .189 0 .324.027.539.108.863.54.863.972 0 .108 0 .189-.026.27-1.782 6.559-4.482 11.85-7.909 15.71v2.726c0 .648.189.918.863.999.459.054 1.025.081 1.863.081.836 0 1.457-.081 1.916-.189.54-.136.837-.324.998-.892.162-.566.298-1.565.324-2.807.027-.432.405-.81.999-.81h.054c.621.026.918.378.918.972v.081c-.054 1.511-.243 2.807-.566 3.697-.324.918-.999 1.485-2.105 1.701-.702.135-1.539.188-2.537.216-1.08 0-1.971-.054-2.673-.135-1.431-.189-2.051-.837-2.051-2.214v-1.943c-1.323 1.215-2.807 2.349-4.373 3.293-.243.162-.486.243-.702.243-.324 0-.621-.162-.783-.513-.135-.162-.189-.378-.189-.567 0-.351.162-.701.54-.918 2.025-1.133 3.86-2.618 5.507-4.291v-10.93zm-2.294 3.077c.054 0 .108 0 .189.027.567.081.837.432.837.918 0 .081 0 .162-.027.243-.27 2.483-.864 5.102-1.7 7.072-.216.405-.567.621-.945.621-.135 0-.297-.027-.432-.108-.378-.161-.54-.432-.54-.756 0-.188.054-.378.162-.594.81-1.862 1.35-4.237 1.62-6.64.053-.513.35-.783.836-.783zm7.153-6.289c.297.27.485.594.485.917 0 .189-.054.378-.189.54-.217.297-.566.459-.918.459-.27 0-.513-.081-.701-.243-1.108-.918-2.943-2.106-4.4-2.807-.297-.189-.486-.486-.486-.81 0-.162.054-.351.162-.513.216-.351.567-.513.918-.513.189 0 .378.054.567.135 1.511.676 3.428 1.836 4.562 2.835zm4.453 6.64c.378 0 .702.216.892.648.917 1.943 1.511 3.914 1.943 5.911.026.136.054.27.054.378 0 .432-.189.756-.675.918-.135.027-.269.054-.405.054-.404 0-.728-.243-.863-.81-.432-1.781-1.053-3.914-1.863-5.695-.08-.135-.107-.297-.107-.459 0-.351.189-.675.567-.837.16-.081.323-.108.457-.108z"/></svg>
\ No newline at end of file