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/2696.svg b/public/emoji/2696.svg
index 77d5349ab..61af8441c 100644
--- a/public/emoji/2696.svg
+++ b/public/emoji/2696.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.9233,13.0771)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.212,-0.511 -0.798,-0.751 -1.308,-0.539 -0.509,0.213 -0.751,0.798 -0.538,1.308 L 2.77,13.307 c 0.212,0.51 0.797,0.751 1.307,0.539 0.51,-0.213 0.751,-0.798 0.539,-1.308 L 0,0 Z"/></g><g transform="translate(13.9229,13.8457)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.212,-0.51 -0.029,-1.095 -0.539,-1.308 -0.509,-0.212 -1.095,0.029 -1.307,0.539 L -6.462,11.77 c -0.212,0.509 0.029,1.095 0.539,1.307 0.509,0.213 1.095,-0.029 1.307,-0.538 L 0,0 Z"/></g><g transform="translate(23.9238,13.0771)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.213,-0.511 -0.799,-0.751 -1.309,-0.539 -0.509,0.213 -0.75,0.798 -0.538,1.308 L 2.77,13.307 c 0.212,0.51 0.796,0.751 1.306,0.539 0.51,-0.213 0.752,-0.798 0.539,-1.308 L 0,0 Z"/></g><g transform="translate(33.9229,13.8457)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.212,-0.51 -0.028,-1.095 -0.538,-1.308 -0.51,-0.212 -1.096,0.029 -1.309,0.539 L -6.462,11.77 c -0.213,0.509 0.029,1.095 0.539,1.307 0.51,0.213 1.095,-0.029 1.307,-0.538 L 0,0 Z"/></g><g transform="translate(14.8569,14)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -13.714,0 c -0.631,0 -1.143,-0.511 -1.143,-1.143 0,-2.524 3.582,-4.571 8,-4.571 4.419,0 8,2.047 8,4.571 C 1.143,-0.511 0.631,0 0,0"/></g><g transform="translate(24,2)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -12,0 c -0.552,0 -1,0.447 -1,1 0,2.209 3.134,4 7,4 C -2.134,5 1,3.209 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(34.8574,14)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -13.715,0 c -0.632,0 -1.142,-0.511 -1.142,-1.143 0,-2.524 3.581,-4.571 8,-4.571 4.418,0 8,2.047 8,4.571 C 1.143,-0.511 0.632,0 0,0"/></g><g transform="translate(19,33)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 -0.447,1 -1,1 -1.552,1 -2,0.552 -2,0 l 0,-27 c 0,-0.553 0.448,-1 1,-1 0.553,0 1,0.447 1,1 L 0,0 Z"/></g><g transform="translate(20,32)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(10,26)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(30,26)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(28,26)" id="g64"><path id="path66" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 0,0 -10,0 -10,0 -10,-1.104 -10,0 0,1.105 3,4 10,4 C -3,4 0,1.105 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M3.923 22.923c-.212.511-.798.751-1.308.539-.51-.213-.751-.798-.539-1.308L6.693 9.616c.212-.51.798-.751 1.307-.539.51.213.751.798.539 1.308L3.923 22.923z"/><path fill="#66757F" d="M13.923 22.154c.212.51-.029 1.095-.539 1.308-.51.212-1.095-.028-1.308-.539L7.461 10.385c-.212-.51.029-1.095.539-1.308.51-.212 1.095.029 1.308.539l4.615 12.538zm10.001.769c-.213.511-.799.751-1.309.539-.51-.213-.75-.798-.538-1.308l4.616-12.539c.212-.509.797-.75 1.307-.538.51.213.752.798.539 1.308l-4.615 12.538z"/><path fill="#66757F" d="M33.923 22.154c.212.51-.028 1.095-.538 1.308-.51.212-1.096-.028-1.309-.539l-4.615-12.538c-.213-.51.029-1.095.539-1.308.51-.212 1.095.029 1.307.539l4.616 12.538z"/><path fill="#FFAC33" d="M14.857 22H1.143C.512 22 0 22.511 0 23.143c0 2.524 3.582 4.571 8 4.571s8-2.047 8-4.571c0-.632-.512-1.143-1.143-1.143zM24 34H12c-.552 0-1-.447-1-1 0-2.209 3.134-4 7-4s7 1.791 7 4c0 .553-.447 1-1 1zm10.857-12H21.143c-.632 0-1.143.511-1.143 1.143 0 2.524 3.581 4.571 8 4.571s8-2.047 8-4.571c0-.632-.511-1.143-1.143-1.143z"/><path fill="#FFAC33" d="M19 3c0-.552-.447-1-1-1-.552 0-1 .448-1 1v27c0 .553.448 1 1 1 .553 0 1-.447 1-1V3z"/><circle fill="#FFAC33" cx="18" cy="4" r="2"/><circle fill="#FFAC33" cx="8" cy="10" r="2"/><circle fill="#FFAC33" cx="28" cy="10" r="2"/><path fill="#FFAC33" d="M28 10c0 1.104 0 0-10 0S8 11.104 8 10s3-4 10-4 10 2.896 10 4z"/></svg>
\ No newline at end of file