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/1f957.svg b/public/emoji/1f957.svg
index 6368a14b4..f18b0965c 100644
--- a/public/emoji/1f957.svg
+++ b/public/emoji/1f957.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(18,1)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -14.958,0 -17,14 -17,18 l 34,0 C 17,16 15.042,0 0,0"/></g><g transform="translate(35,18.9443)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.216 -7.611,-9.444 -17,-9.444 -9.389,0 -17,4.228 -17,9.444 0,5.216 7.611,8.444 17,8.444 C -7.611,8.444 0,5.216 0,0"/></g><g transform="translate(2.7085,17.125)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.808,1.161 -2.333,3.5 -0.708,7 0,8.833 1.471,10.027 1.667,9.458 2.125,8.125 3.042,6.958 4.417,7.083 4.399,6.61 3.748,11.392 6.042,12.667 c 1.125,0.625 2.333,-0.375 3.708,-2.584 2.202,-3.536 7.811,-1.884 9.385,-0.958 1.594,0.938 2.991,1.552 2.574,4.063 -0.092,0.55 0.743,1.029 1.594,0.573 1.431,-0.766 3.498,-2.671 3.864,-4.761 1.02,-0.271 1.786,0.163 2.375,1.354 0.292,0.59 1.292,0.729 1.719,-0.041 0.754,-1.356 1.992,-5.526 0.24,-9.105 -2,-4.083 -5.042,-6.25 -11.875,-7.125 C 12.792,-6.792 4,-5.75 0,0"/></g><g transform="translate(19.417,25.854)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.105 -1.81,-3.813 -4.042,-3.813 -2.232,0 -4.042,1.708 -4.042,3.813 0,2.105 1.81,3.813 4.042,3.813 C -1.81,3.813 0,2.105 0,0"/></g><g transform="translate(18.417,25.8535)" id="g36"><path id="path38" style="fill:#c6e5b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.585 -1.362,-2.869 -3.042,-2.869 -1.68,0 -3.042,1.284 -3.042,2.869 0,1.585 1.362,2.87 3.042,2.87 C -1.362,2.87 0,1.585 0,0"/></g><g transform="translate(10.459,21.5)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -1.026,-2 -2.292,-2 -1.266,0 -2.292,0.896 -2.292,2 0,1.105 1.026,2 2.292,2 C -1.026,2 0,1.105 0,0"/></g><g transform="translate(17.5244,20.8179)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.267,-2.388 -2.104,-0.951 -4.614,-2.284 -2.51,-1.332 -3.209,-4.928 -4.477,-2.541 -1.267,2.388 -0.26,5.405 2.25,6.737 C -4.331,3.244 -1.268,2.388 0,0"/></g><g transform="translate(26.459,23.5)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -1.026,-2 -2.292,-2 -1.266,0 -2.292,0.896 -2.292,2 0,1.105 1.026,2 2.292,2 C -1.026,2 0,1.105 0,0"/></g><g transform="translate(29.1172,15.8711)" id="g52"><path id="path54" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.564,-1.48 -1.178,1.412 -2.734,3.056 -4.292,4.7 -7.2,4.471 -5.638,5.952 -4.074,7.434 -1.544,7.301 0.013,5.658 1.569,4.015 1.563,1.481 0,0"/></g><g transform="translate(28.1172,14.8711)" id="g56"><path id="path58" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.564,-1.48 -1.178,1.412 -2.734,3.057 -4.292,4.7 -7.2,4.471 -5.638,5.952 -4.074,7.434 -1.544,7.301 0.013,5.658 1.569,4.015 1.563,1.481 0,0"/></g><g transform="translate(24.0127,16.0723)" id="g60"><path id="path62" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.781,-2.063 -1.798,-0.555 -3.966,-1.377 -2.166,-0.821 -3.099,-3.658 -3.881,-1.597 -0.781,2.06 0.343,4.398 2.509,5.219 C -3.171,3.066 -0.781,2.06 0,0"/></g><g transform="translate(8.9585,16.916)" id="g64"><path id="path66" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.167,1.542 2.834,8.418 8.167,2.417 6.917,2.209 3.875,2.209 2.5,0.292 1.125,-1.624 -0.125,0.084 0,0"/></g><g transform="translate(4.917,16.291)" id="g68"><path id="path70" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.728,0.971 1.75,3.209 3.625,1.293 4.417,2.251 8.333,4.167 9.792,0 10.458,0.75 15.917,0.917 16,-3.708 16.041,-4.333 9.705,-4.214 6.458,-3.458 4.667,-3.041 1.375,-1.833 0,0"/></g><g transform="translate(26,13.542)" id="g72"><path id="path74" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.167,-0.315 0.793,5.125 4.459,4.208 4.584,5.208 5.375,8.5 7.667,7.916 7.75,6.958 7.708,2.084 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M18 35C3.042 35 1 21 1 17h34c0 2-1.958 18-17 18z"/><path fill="#66757F" d="M35 17.056c0 5.216-7.611 9.444-17 9.444S1 22.271 1 17.056c0-5.216 7.611-8.444 17-8.444 9.389-.001 17 3.228 17 8.444z"/><path fill="#77B255" d="M2.708 18.875c-.808-1.161-2.333-3.5-.708-7 .708-1.833 2.18-3.027 2.375-2.458.458 1.333 1.375 2.5 2.75 2.375-.018.473-.669-4.309 1.625-5.584 1.125-.625 2.333.375 3.708 2.583 2.202 3.537 7.811 1.884 9.385.958 1.594-.938 2.99-1.552 2.573-4.062-.092-.551.743-1.029 1.595-.573 1.431.766 3.498 2.671 3.863 4.761 1.021.271 1.786-.163 2.375-1.354.292-.59 1.292-.729 1.72.041.754 1.356 1.992 5.527.239 9.105-2 4.083-5.042 6.25-11.875 7.125s-15.625-.167-19.625-5.917z"/><path fill="#5C913B" d="M19.417 10.146c0 2.106-1.81 3.812-4.042 3.812-2.232 0-4.042-1.707-4.042-3.812 0-2.105 1.81-3.812 4.042-3.812 2.232-.001 4.042 1.707 4.042 3.812z"/><path fill="#C6E5B3" d="M18.417 10.146c0 1.585-1.362 2.869-3.042 2.869-1.68 0-3.042-1.285-3.042-2.869 0-1.585 1.362-2.87 3.042-2.87 1.68.001 3.042 1.286 3.042 2.87z"/><ellipse fill="#292F33" cx="8.167" cy="14.5" rx="2.292" ry="2"/><path fill="#DD2E44" d="M17.524 15.182c1.267 2.388-2.104.951-4.614 2.284-2.511 1.333-3.209 4.929-4.477 2.541-1.268-2.388-.26-5.404 2.25-6.737 2.511-1.332 5.574-.476 6.841 1.912z"/><ellipse fill="#292F33" cx="24.167" cy="12.5" rx="2.292" ry="2"/><path fill="#9266CC" d="M29.117 20.129c-1.564 1.48-1.178-1.412-2.734-3.056-1.558-1.644-4.466-1.415-2.903-2.896 1.563-1.481 4.094-1.349 5.65.294 1.557 1.643 1.551 4.177-.013 5.658z"/><path fill="#E1E8ED" d="M28.117 21.129c-1.564 1.48-1.178-1.412-2.734-3.057-1.558-1.643-4.466-1.415-2.903-2.896 1.563-1.481 4.094-1.349 5.65.294 1.557 1.644 1.551 4.178-.013 5.659z"/><path fill="#DD2E44" d="M24.013 19.928c.781 2.062-1.798.555-3.966 1.377-2.166.821-3.1 3.658-3.881 1.597-.781-2.06.343-4.398 2.509-5.219 2.167-.821 4.556.185 5.338 2.245z"/><path fill="#EA596E" d="M8.958 19.084c-.167-1.542 2.833-8.418 8.167-2.417-1.25.208-4.292.208-5.667 2.125s-2.625.208-2.5.292"/><path fill="#A6D388" d="M4.917 19.709c-.728-.971 1.75-3.209 3.625-1.293.792-.958 4.708-2.874 6.167 1.293.667-.75 6.125-.917 6.208 3.708.041.625-6.295.506-9.542-.25-1.792-.417-5.083-1.625-6.458-3.458zM26 22.458c-1.167.315.793-5.125 4.459-4.208.125-1 .916-4.292 3.208-3.708.083.958.041 5.832-7.667 7.916z"/></svg>
\ No newline at end of file