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/1f9db-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9db-1f3ff-200d-2640-fe0f.svg
index 532b32ce1..443150ac0 100644
--- a/public/emoji/1f9db-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f9db-1f3ff-200d-2640-fe0f.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(32,0)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(27,7.3826)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.239,2.225 7,9.617 7,11.617 0,0 -4.667,5 -16,5 l 0,-23 c 0,0 7.103,4.499 9,6.383"/></g><g transform="translate(9,7.3826)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.239,2.225 -7,9.617 -7,11.617 0,0 4.667,5 16,5 l 0,-23 c 0,0 -7.103,4.499 -9,6.383"/></g><g transform="translate(18.75,16.25)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(18.0043,31.9332)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.35,0 11.601,-2.175 11.601,-11.601 0,-9.426 0,-11.602 -2.175,-11.602 -2.176,0 -5.076,2.176 -9.426,2.176 -4.351,0 -7.19,-2.176 -9.427,-2.176 -2.423,0 -2.175,8.701 -2.175,11.602 C -11.602,-2.175 -4.351,0 0,0"/></g><g transform="translate(17.9957,31.9332)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.35,0 -11.601,-2.175 -11.601,-11.601 0,-9.426 0,-11.602 2.175,-11.602 2.176,0 5.076,2.176 9.426,2.176 4.351,0 7.19,-2.176 9.427,-2.176 2.423,0 2.175,8.701 2.175,11.602 C 11.602,-2.175 4.351,0 0,0"/></g><g transform="translate(22.2388,8)" id="g44"><path id="path46" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.92 -4.239,-7 -4.239,-7 0,0 -4.239,5.019 -4.239,7 L 0,0 Z"/></g><g transform="translate(14.291,7.7545)" id="g48"><path id="path50" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.553,-1.129 2.959,-1.039 3.709,-1.039 0.75,0 2.325,-0.09 3.697,1.006 L 7.418,4.354 0,4.354 0,0 Z"/></g><g transform="translate(14.2907,9.9759)" id="g52"><path id="path54" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.031,-1.224 3.022,-1.336 3.699,-1.336 0.677,0 2.67,0.112 3.701,1.336 l 0,3.112 -7.4,0 L 0,0 Z"/></g><g transform="translate(9.2404,20.649)" id="g56"><path id="path58" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,6.182 3.896,11.194 8.702,11.194 4.803,0 8.699,-5.012 8.699,-11.194 0,-6.181 -3.896,-11.238 -8.699,-11.238 C 3.896,-11.238 0,-6.181 0,0"/></g><g transform="translate(7.1117,17.1709)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.022,1.06 -0.047,0.237 -0.047,0.493 0,3.626 2.176,-0.524 2.176,2.059 0,2.584 1.45,2.843 2.9,4.293 0.725,0.725 2.175,2.147 2.175,2.147 0,0 3.625,-2.191 6.526,-2.191 2.9,0 5.801,-1.457 5.801,-4.358 0,-2.899 2.175,1.679 2.175,-1.946 0,-0.259 -0.024,0.563 -0.043,-0.497 l 0.762,0 c 0.006,2.119 0.006,2.039 0.006,3.393 0,9.426 -7.25,12.936 -11.602,12.936 -4.349,0 -11.53,-3.451 -11.53,-12.878 0,-0.84 -0.021,-1.332 0.009,-3.451 L 0,0 Z"/></g><g transform="translate(14.4059,18.3506)" id="g64"><path id="path66" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.493,0 -0.896,0.404 -0.896,0.897 l 0,0.895 c 0,0.493 0.403,0.897 0.896,0.897 0.494,0 0.897,-0.404 0.897,-0.897 l 0,-0.895 C 0.897,0.404 0.494,0 0,0"/></g><g transform="translate(21.5744,18.3506)" id="g68"><path id="path70" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.493,0 -0.896,0.404 -0.896,0.897 l 0,0.895 c 0,0.493 0.403,0.897 0.896,0.897 0.493,0 0.896,-0.404 0.896,-0.897 l 0,-0.895 C 0.896,0.404 0.493,0 0,0"/></g><g transform="translate(18.8858,15.5813)" id="g72"><path id="path74" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.791,0 c -0.248,0 -0.448,0.201 -0.448,0.448 l 0,0.163 c 0,0.247 0.2,0.449 0.448,0.449 L 0,1.06 c 0.247,0 0.449,-0.202 0.449,-0.449 l 0,-0.163 C 0.449,0.201 0.247,0 0,0"/></g><g transform="translate(26,21.72)" id="g76"><path id="path78" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.47,-0.129 c 0,0 -1.192,-3.4 -0.001,-3.996 C 2.194,-5.457 3,-0.332 3,1 3,2 0,0 0,0"/></g><g transform="translate(10,21.72)" id="g80"><path id="path82" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.47,-0.129 c 0,0 1.192,-3.4 0.001,-3.996 C -2.194,-5.457 -3,-0.332 -3,1 -3,2 0,0 0,0"/></g><g transform="translate(18.0595,11.4959)" id="g84"><path id="path86" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,1.904 -3.741,2.045 -0.256,0.257 -0.256,0.671 0,0.927 0.248,0.249 0.645,0.256 0.902,0.024 C -2.787,2.958 -2.118,2.509 0,2.509 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,3.253 3.499,3.241 3.755,2.985 4.011,2.729 3.997,2.302 3.741,2.045 3.6,1.904 2.754,0 0,0"/></g><g transform="translate(15.6259,13.9959)" id="g88"><path id="path90" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.331,0 -0.637,-0.149 -0.84,-0.41 -0.204,-0.261 -0.274,-0.594 -0.194,-0.915 0.008,-0.034 0.02,-0.066 0.035,-0.098 l 1.012,-2.072 c 0.084,-0.172 0.259,-0.28 0.45,-0.28 0.002,0 0.005,0 0.008,0 0.195,0.003 0.369,0.119 0.448,0.296 l 0.88,1.973 c 0.012,0.027 0.021,0.054 0.028,0.083 0.064,0.257 0.018,0.52 -0.13,0.741 -0.173,0.258 -0.479,0.441 -0.817,0.489 l -0.767,0.18 C 0.076,-0.004 0.038,0 0,0"/></g><g transform="translate(16.4345,13.3084)" id="g92"><path id="path94" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.809,0.187 c -0.368,0 -0.638,-0.346 -0.549,-0.703 l 1.012,-2.072 0.879,1.973 C 0.614,-0.294 0.322,-0.046 0,0"/></g><g transform="translate(20.454,13.9959)" id="g96"><path id="path98" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.038,0 -0.076,-0.004 -0.113,-0.013 L -0.922,-0.2 c -0.296,-0.041 -0.602,-0.224 -0.775,-0.482 -0.148,-0.221 -0.195,-0.484 -0.13,-0.741 0.007,-0.029 0.016,-0.056 0.028,-0.083 l 0.88,-1.973 c 0.079,-0.177 0.253,-0.293 0.448,-0.296 0.003,0 0.006,0 0.008,0 0.191,0 0.366,0.108 0.45,0.28 l 1.012,2.072 c 0.015,0.032 0.027,0.064 0.035,0.098 0.08,0.321 0.01,0.654 -0.194,0.915 C 0.637,-0.149 0.331,0 0,0"/></g><g transform="translate(19.6454,13.3084)" id="g100"><path id="path102" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.809,0.187 c 0.368,0 0.638,-0.346 0.549,-0.703 L 0.346,-2.588 -0.533,-0.615 C -0.614,-0.294 -0.322,-0.046 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M32 36v-2c0-3.313-2.687-6-6-6H10c-3.313 0-6 2.687-6 6v2h28z"/><path fill="#BE1931" d="M27 28.617C29.239 26.393 34 19 34 17c0 0-4.667-5-16-5v23s7.103-4.498 9-6.383zm-18 0C6.761 26.393 2 19 2 17c0 0 4.667-5 16-5v23s-7.103-4.498-9-6.383z"/><path fill="#C1694F" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75z"/><path fill="#292F33" d="M18.004 4.067c4.35 0 11.601 2.175 11.601 11.601 0 9.427 0 11.602-2.175 11.602s-5.076-2.175-9.426-2.175c-4.351 0-7.19 2.175-9.427 2.175-2.424 0-2.176-8.701-2.176-11.602.001-9.426 7.253-11.601 11.603-11.601"/><path fill="#292F33" d="M17.996 4.067c-4.35 0-11.601 2.175-11.601 11.601 0 9.427 0 11.602 2.175 11.602s5.076-2.175 9.426-2.175c4.351 0 7.19 2.175 9.427 2.175 2.424 0 2.176-8.701 2.176-11.602-.001-9.426-7.253-11.601-11.603-11.601"/><path fill="#7C533E" d="M22.239 28c0 1.92-4.239 7-4.239 7s-4.239-5.019-4.239-7h8.478z"/><path fill="#7C533E" d="M14.291 28.246c1.553 1.129 2.959 1.039 3.709 1.039s2.325.09 3.697-1.006l.012-4.387h-7.418v4.354z"/><path fill="#664131" d="M14.291 26.024c1.031 1.224 3.022 1.336 3.699 1.336s2.67-.111 3.701-1.336v-3.112h-7.4v3.112z"/><path fill="#7C533E" d="M9.24 15.351c0-6.182 3.896-11.194 8.702-11.194 4.804 0 8.699 5.012 8.699 11.194 0 6.181-3.895 11.238-8.699 11.238-4.806 0-8.702-5.057-8.702-11.238"/><path fill="#292F33" d="M7.112 18.829c-.022-1.06-.047-.237-.047-.493 0-3.626 2.176.524 2.176-2.059 0-2.584 1.449-2.843 2.9-4.293.725-.725 2.175-2.147 2.175-2.147s3.625 2.191 6.526 2.191c2.9 0 5.8 1.457 5.8 4.358 0 2.9 2.175-1.679 2.175 1.947 0 .259-.024-.563-.042.497h.762c.006-2.119.006-2.039.006-3.393 0-9.426-7.25-12.936-11.602-12.936-4.35 0-11.53 3.451-11.53 12.878 0 .84-.021 1.332.009 3.451h.692z"/><path fill="#DD2E44" d="M14.406 17.649c-.493 0-.896-.404-.896-.897v-.895c0-.493.404-.896.896-.896.494 0 .897.404.897.896v.895c0 .494-.403.897-.897.897m7.168 0c-.493 0-.896-.404-.896-.897v-.895c0-.493.404-.896.896-.896.493 0 .896.404.896.896v.895c.001.494-.403.897-.896.897"/><path fill="#3D2E24" d="M18.886 20.419h-1.791c-.247 0-.448-.201-.448-.448v-.162c0-.247.201-.449.448-.449h1.791c.247 0 .449.202.449.449v.162c0 .247-.202.448-.449.448"/><path fill="#7C533E" d="M26 14.28l-.47.129s-1.192 3.401 0 3.997C28.194 19.737 29 14.612 29 13.28c0-1-3 1-3 1zm-16 0l.47.129s1.192 3.401 0 3.997C7.806 19.737 7 14.612 7 13.28c0-1 3 1 3 1z"/><path fill="#3D2E24" d="M18.059 24.504c-2.754 0-3.6-1.904-3.741-2.045-.256-.256-.256-.671 0-.927.248-.248.645-.255.902-.024.052.038.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.255-.255.656-.243.913.013.256.256.242.684-.014.94-.141.142-.986 2.046-3.741 2.046z"/><path fill="#3D2E24" d="M15.626 22.004c-.331 0-.637.149-.84.41-.203.261-.274.594-.194.915.008.034.02.067.036.098l1.012 2.072c.084.172.258.281.449.281h.009c.194-.003.369-.119.448-.296l.88-1.973c.012-.027.021-.054.028-.082.064-.257.018-.521-.13-.741-.173-.258-.479-.441-.817-.489l-.767-.18c-.038-.011-.076-.015-.114-.015z"/><path fill="#F5F8FA" d="M16.434 22.692l-.809-.188c-.368 0-.639.346-.549.703l1.012 2.072.88-1.973c.08-.32-.212-.568-.534-.614z"/><path fill="#3D2E24" d="M20.454 22.004c-.038 0-.076.004-.113.013l-.809.188c-.297.041-.602.224-.775.482-.148.221-.195.484-.13.741.007.028.017.056.028.082l.88 1.973c.079.177.254.293.448.296h.009c.191 0 .365-.109.449-.281l1.012-2.072c.015-.031.027-.064.036-.098.08-.321.009-.654-.194-.915-.204-.259-.51-.409-.841-.409z"/><path fill="#F5F8FA" d="M19.645 22.692l.809-.188c.368 0 .639.346.549.703l-1.012 2.072-.88-1.973c-.079-.32.213-.568.534-.614z"/></svg>
\ No newline at end of file