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/1f9d8-200d-2640-fe0f.svg b/public/emoji/1f9d8-200d-2640-fe0f.svg
index 344e7ce05..241b3d23a 100644
--- a/public/emoji/1f9d8-200d-2640-fe0f.svg
+++ b/public/emoji/1f9d8-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(5.001,8)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.367,0 -0.72,0.202 -0.896,0.553 -0.247,0.494 -0.046,1.094 0.448,1.342 l 5.544,2.772 0.917,5.498 c 0.091,0.543 0.605,0.912 1.151,0.821 0.544,-0.09 0.912,-0.606 0.821,-1.151 l -1,-5.999 C 6.933,3.521 6.732,3.249 6.446,3.105 l -6,-3 C 0.303,0.034 0.15,0 0,0"/></g><g transform="translate(30.999,8)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.15,0 -0.303,0.034 -0.446,0.105 l -6,3 c -0.286,0.144 -0.487,0.416 -0.539,0.731 l -1,5.999 c -0.091,0.545 0.277,1.061 0.822,1.151 0.543,0.091 1.06,-0.277 1.15,-0.821 L -5.097,4.667 0.448,1.895 C 0.942,1.647 1.143,1.047 0.896,0.553 0.72,0.202 0.367,0 0,0"/></g><g transform="translate(23,4.25)" id="g28"><path id="path30" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-1.25 -5,-1.25 -5,0 -5,1.25 -5,1.25 l 0,5.5 10,0 L 0,0 Z"/></g><g transform="translate(18.9997,36)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.264,0 -2.435,-0.393 -3.402,-1.061 -3.598,-1.031 -3.795,-1 -4,-1 -6.208,-1 -8,-2.791 -8,-5 l 0,-4 c 0,-3.866 3.134,-7 7,-7 3.867,0 7,3.134 7,7 l 0,2.999 C 6,-2.686 3.314,0 0,0"/></g><g transform="translate(23,21)" id="g36"><path id="path38" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,0 -2,0 -3,0 c -2.563,0 -2.458,-4 -2.458,-4 l 2.458,0 0,-9 5,0 5,0 0,9 2.458,0 c 0,0 0.105,4 -2.458,4"/></g><g transform="translate(16.0002,25)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 L 4,0 0,0 Z"/></g><g transform="translate(16.0002,33)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 C 0,0 -0.011,-3.285 -3,-3.894 L -3,-6 l 0,0 c 0,-2.763 2.238,-5 4.999,-5 C 4.761,-11 7,-8.763 7,-6 l 0,0 0,2.032 C 0.019,-3.644 0,0 0,0"/></g><g transform="translate(20.0002,24)" id="g48"><path id="path50" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(16.0002,27.5)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(21.0002,27.5)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(17.0002,26)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 2,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(8.4173,1.444)" id="g64"><path id="path66" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.308,-0.769 1.181,-1.142 1.95,-0.834 l 12.395,3.803 c 0,0 3.49,-0.701 3.351,1.294 C 17.589,5.783 15.11,6.508 13.229,5.754 11.348,5 0.834,1.95 0.834,1.95 0.065,1.642 -0.308,0.769 0,0"/></g><g transform="translate(25.7557,5.3924)" id="g68"><path id="path70" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.212,0.689 -2.021,0.422 -2.456,0.303 -0.435,-0.12 -12.469,-3.845 -13.453,-4.16 -0.924,-0.296 -0.364,-1.06 0.087,-1.027 0.033,0.009 0.067,0.01 0.099,0.021 l 11.768,3.586 c 0.877,0.274 1.884,0.166 2.719,0.244 0.395,0.037 0.802,0.166 0.876,0.202 C -0.193,-0.755 0.151,-0.491 0,0"/></g><g transform="translate(27.5827,1.444)" id="g72"><path id="path74" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.308,-0.769 -1.181,-1.142 -1.95,-0.834 l -12.395,3.803 c 0,0 -3.49,-0.701 -3.351,1.294 0.107,1.52 2.586,2.245 4.467,1.491 C -11.348,5 -0.834,1.95 -0.834,1.95 -0.065,1.642 0.308,0.769 0,0"/></g><g transform="translate(10.2443,5.3924)" id="g76"><path id="path78" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.212,0.689 2.021,0.422 2.456,0.303 0.435,-0.12 12.469,-3.845 13.453,-4.16 0.924,-0.296 0.364,-1.06 -0.087,-1.027 -0.033,0.009 -0.067,0.01 -0.099,0.021 L 3.955,-1.277 C 3.078,-1.003 2.071,-1.111 1.236,-1.033 0.841,-0.996 0.434,-0.867 0.36,-0.831 0.193,-0.755 -0.151,-0.491 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M5.001 28c-.367 0-.72-.202-.896-.553-.247-.494-.047-1.095.447-1.342l5.544-2.772.917-5.498c.091-.544.605-.913 1.151-.822.544.091.913.606.822 1.151l-1 6c-.053.315-.253.587-.539.73l-6 3c-.143.072-.296.106-.446.106zm25.998 0c-.15 0-.303-.034-.446-.105l-6-3c-.286-.144-.486-.415-.539-.73l-1-6c-.091-.545.277-1.06.822-1.151.543-.09 1.061.277 1.15.822l.916 5.498 5.545 2.772c.494.247.694.848.447 1.342-.175.35-.528.552-.895.552z"/><path fill="#4289C1" d="M13 27.25h10v4.5H13z"/><path fill="#FFAC33" d="M19 0c-1.264 0-2.435.393-3.402 1.061C15.402 1.031 15.205 1 15 1c-2.209 0-4 1.791-4 4v4c0 3.866 3.134 7 7 7s7-3.134 7-7V6.001C25 2.687 22.314 0 19 0z"/><path fill="#9268CA" d="M23 15H13c-2.562 0-2.458 4-2.458 4H13v9h10v-9h2.458s.104-4-2.458-4z"/><path fill="#FFDC5D" d="M16 11v4c0 1.104.896 2 2 2s2-.896 2-2v-4h-4z"/><path fill="#FFDC5D" d="M16 3s-.011 3.285-3 3.894V9c0 2.762 2.238 5 5 5s5-2.237 5-5V6.968C16.019 6.644 16 3 16 3z"/><path fill="#DF1F32" d="M20 12h-4s0 1 2 1 2-1 2-1z"/><circle fill="#662113" cx="15.5" cy="8.5" r=".5"/><circle fill="#662113" cx="20.5" cy="8.5" r=".5"/><path fill="#C1694F" d="M17 10h2s0 1-1 1-1-1-1-1z"/><path fill="#FFDC5D" d="M8.417 34.556c.308.769 1.181 1.142 1.95.834l12.395-3.803s3.49.701 3.351-1.294c-.106-1.52-2.586-2.245-4.467-1.491-1.881.754-12.395 3.803-12.395 3.803-.768.309-1.142 1.182-.834 1.951z"/><path fill="#F9CA55" d="M25.756 30.608c-.212-.689-2.021-.422-2.456-.303-.435.12-12.47 3.844-13.453 4.16-.924.296-.364 1.06.087 1.026.033-.008.066-.01.099-.02L21.8 31.884c.877-.274 1.884-.166 2.719-.244.396-.037.802-.167.877-.202.166-.075.511-.34.36-.83z"/><path fill="#FFDC5D" d="M27.583 34.556c-.308.769-1.181 1.142-1.95.834l-12.395-3.803s-3.49.701-3.351-1.294c.106-1.52 2.586-2.245 4.467-1.491 1.881.754 12.395 3.803 12.395 3.803.768.309 1.142 1.182.834 1.951z"/><path fill="#F9CA55" d="M10.244 30.608c.212-.689 2.021-.422 2.456-.303.435.12 12.47 3.844 13.453 4.16.924.296.364 1.06-.087 1.026-.033-.008-.066-.01-.099-.02L14.2 31.884c-.877-.274-1.884-.166-2.719-.244-.396-.037-.802-.167-.877-.202-.166-.075-.511-.34-.36-.83z"/></svg>
\ No newline at end of file