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/1f4fd.svg b/public/emoji/1f4fd.svg
index 922c71b8d..d5744ba83 100644
--- a/public/emoji/1f4fd.svg
+++ b/public/emoji/1f4fd.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(3.333,24.0005)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.519 0.105,1.01 0.261,1.477 L 2.356,0.22 C 2.349,0.146 2.334,0.075 2.334,0 c 0,-0.75 0.36,-1.41 0.91,-1.837 C 2.62,-2.316 2.148,-2.971 1.892,-3.732 0.75,-2.882 0,-1.533 0,0 m 4.667,4.666 c 0.519,0 1.01,-0.104 1.476,-0.261 L 4.887,2.311 C 4.814,2.318 4.742,2.333 4.667,2.333 4.189,2.333 3.745,2.188 3.375,1.941 L 1.282,3.196 c 0.851,0.901 2.048,1.47 3.385,1.47 M 7.864,3.385 C 8.764,2.534 9.334,1.337 9.334,0 9.334,-0.344 9.291,-0.678 9.22,-1.001 l -2.453,0 C 6.912,-0.696 7,-0.36 7,0 7,0.478 6.855,0.922 6.608,1.292 L 7.864,3.385 Z M 16.952,3 c 0,0.563 0.085,1.106 0.237,1.62 L 20.382,3.023 C 20.382,3.015 20.38,3.008 20.38,3 c 0,-0.657 0.313,-1.245 0.771,-1.662 l -0.668,-2.339 -1.871,0 C 17.592,0.03 16.952,1.436 16.952,3 m 5.715,5.714 c 0.282,0 0.557,-0.027 0.828,-0.066 L 22.364,5.255 C 21.96,5.201 21.592,5.045 21.283,4.809 l -3.196,1.598 c 1.042,1.398 2.703,2.307 4.58,2.307 m 1.827,-7.033 3.552,-0.592 c -0.659,-1.857 -2.254,-3.26 -4.214,-3.669 -0.37,0.482 -0.843,0.874 -1.392,1.148 l 0.625,2.19 c 0.556,0.113 1.076,0.452 1.429,0.923 m 0.9,6.341 C 27.156,7.063 28.355,5.203 28.378,3.061 L 24.847,3.65 c -0.112,0.376 -0.31,0.714 -0.583,0.982 l 1.13,3.39 z m 5.347,-14.023 -4.832,-3 -0.242,0 -0.525,0 -0.475,0 0,4 c 0,0.088 -0.02,0.17 -0.026,0.256 3.462,0.881 6.026,4.009 6.026,7.745 0,4.418 -3.582,8 -8,8 -4.418,0 -8.001,-3.582 -8.001,-8 0,-1.464 0.412,-2.822 1.099,-4.001 l -4.178,0 c 0.047,0.328 0.08,0.66 0.08,1.001 0,3.866 -3.134,7 -7,7 -3.865,0 -7,-3.134 -7,-7 0,-2.79 1.638,-5.193 4,-6.318 l 0,-10.683 c 0,-2.209 1.791,-4 4,-4 l 15,0 c 2.209,0 4,1.791 4,4 l 0,3 0.475,0 0.525,0 0.242,0 4.832,-3 0.926,0 0,11 -0.926,0 z"/></g><g transform="translate(22,17)" id="g24"><path id="path26" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 0.896,-2 2,-2 3.105,-2 4,-1.104 4,0 4,1.105 3.105,2 2,2 0.896,2 0,1.105 0,0"/></g><g transform="translate(7,17)" id="g28"><path id="path30" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 0.896,-2 2,-2 3.105,-2 4,-1.104 4,0 4,1.105 3.105,2 2,2 0.896,2 0,1.105 0,0"/></g><g transform="translate(24,9)" id="g32"><path id="path34" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.895,2 -2,2 l -11,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-6 c 0,-1.105 0.896,-2 2,-2 l 11,0 c 1.105,0 2,0.895 2,2 l 0,6 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M34.074 18l-4.832 3H28v-4c0-.088-.02-.169-.026-.256C31.436 15.864 34 12.735 34 9c0-4.418-3.582-8-8-8s-8.001 3.582-8.001 8c0 1.463.412 2.822 1.099 4H14.92c.047-.328.08-.66.08-1 0-3.866-3.134-7-7-7-3.865 0-7 3.134-7 7 0 2.79 1.638 5.193 4 6.317V29c0 2.209 1.791 4 4 4h15c2.209 0 4-1.791 4-4v-3h1.242l4.832 3H35V18h-.926zM28.727 3.977c1.762.959 2.961 2.819 2.984 4.961L28.18 8.35c-.112-.376-.31-.715-.583-.982l1.13-3.391zm-.9 6.342l3.552.592c-.66 1.857-2.254 3.26-4.214 3.669-.37-.483-.843-.875-1.392-1.148l.625-2.19c.556-.113 1.076-.452 1.429-.923zM26 3.285c.282 0 .557.027.828.067l-1.131 3.392c-.404.054-.772.21-1.081.446L21.42 5.592c1.042-1.397 2.703-2.307 4.58-2.307zM20.285 9c0-.563.085-1.106.236-1.62l3.194 1.597-.002.023c0 .657.313 1.245.771 1.662L23.816 13h-1.871c-1.02-1.03-1.66-2.436-1.66-4zm-9.088-.385c.901.851 1.47 2.048 1.47 3.385 0 .344-.043.677-.113 1H10.1c.145-.304.233-.641.233-1 0-.478-.145-.922-.392-1.292l1.256-2.093zM8 7.333c.519 0 1.01.105 1.476.261L8.22 9.688c-.073-.007-.145-.022-.22-.022-.478 0-.922.145-1.292.392L4.615 8.803c.851-.901 2.048-1.47 3.385-1.47zM3.333 12c0-.519.105-1.01.261-1.477l2.095 1.257c-.007.073-.022.144-.022.22 0 .75.36 1.41.91 1.837-.624.479-1.097 1.134-1.353 1.895-1.141-.851-1.891-2.199-1.891-3.732z"/><circle fill="#8899A6" cx="24" cy="19" r="2"/><circle fill="#8899A6" cx="9" cy="19" r="2"/><path fill="#8899A6" d="M24 27c0-1.104-.896-2-2-2H11c-1.104 0-2 .896-2 2v6c0 1.104.896 2 2 2h11c1.104 0 2-.896 2-2v-6z"/></svg>
\ No newline at end of file