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/1f44d-1f3fb.svg b/public/emoji/1f44d-1f3fb.svg
index f2ea302f9..ac1ab0270 100644
--- a/public/emoji/1f44d-1f3fb.svg
+++ b/public/emoji/1f44d-1f3fb.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(27.084,24.001)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16.218,0.772 c 0.557,2.061 1.207,4.687 1.207,5.728 0,2.5 -0.577,5.5 -2.51,5.5 -2.5,0 -3.521,0 -3.521,-2.5 0,-3.5 -3,-8.501 -3,-10.501 0,-0.491 0.015,-1.032 0.038,-1.57 l -0.08,-13.555 c 0,-5.542 1,-7.85 7,-7.85 6.001,0 16.816,0.002 16.816,0.002 2.186,-0.029 3.987,1.269 4.243,3.049 0.08,0.553 2.941,15.824 2.941,15.824 C 7.374,-2.876 6.749,-0.21 0,0"/></g><g transform="translate(33.2813,16.6279)" id="g24"><path id="path26" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.196,0.338 -0.555,0.514 -0.923,0.496 -0.924,0.02 -13.351,0.878 -15.042,1.094 -0.14,0.025 -1.364,0.281 -1.237,1.694 0.04,0.443 0.161,1.028 0.512,1.303 0.289,0.227 0.669,0.18 0.675,0.179 l 0,0 13.404,-1.087 c 0.567,-0.057 1.033,0.366 1.077,0.916 0.044,0.551 -0.366,1.033 -0.917,1.077 l -13.253,1.069 c -0.291,0.041 -1.283,0.123 -2.174,-0.545 -0.762,-0.572 -1.205,-1.491 -1.316,-2.734 -0.168,-1.874 0.835,-2.934 1.837,-3.459 -0.481,-0.564 -0.882,-1.326 -0.923,-2.34 -0.095,-2.328 1.416,-3.581 1.77,-3.842 -0.661,-0.735 -1.007,-1.525 -1.017,-2.375 -0.016,-1.327 0.777,-2.356 1.46,-3.002 -0.233,-0.257 -0.436,-0.546 -0.564,-0.891 -0.423,-1.133 -0.186,-2.539 0.574,-3.419 0.443,-0.512 1.019,-0.786 1.629,-0.786 0.145,0 0.293,0.015 0.441,0.048 0.54,0.116 0.883,0.647 0.767,1.187 -0.115,0.54 -0.647,0.886 -1.187,0.768 -0.014,0.002 -0.049,-0.01 -0.136,0.09 -0.25,0.289 -0.396,0.926 -0.214,1.414 0.116,0.311 0.333,0.474 0.703,0.529 0.192,0.027 0.35,0.121 0.489,0.237 l 10.16,-0.249 0.042,0 c 0.533,0 0.976,0.233 0.998,0.772 0.022,0.551 -0.406,0.831 -0.958,0.853 l -10.937,0.445 c -0.472,0.36 -1.277,1.141 -1.267,1.936 0.01,0.828 0.932,1.579 1.746,2.081 l 11.685,-0.752 c 0.023,-10e-4 0.044,-0.002 0.066,-0.002 0.523,0 0.963,0.406 0.997,0.936 0.035,0.551 -0.383,1.027 -0.934,1.062 l -13.526,0.87 c -0.292,0.278 -0.833,0.941 -0.789,2.008 0.053,1.295 1.387,1.836 1.436,1.857 0.028,0.01 0.046,0.032 0.072,0.044 3.28,-0.28 11.03,-0.914 13.593,-0.914 0.452,0 0.743,0.02 0.82,0.065 C 0.116,-1.09 0.278,-0.477 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F6DDCD" d="M34.956 17.916c0-.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.771v10.719c0 1.833.18 3.595 2.758 3.885C8.195 34.219 7.633 36 11.238 36h18.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="#DFA994" d="M23.02 21.249h8.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