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/1f3e4.svg b/public/emoji/1f3e4.svg
index 62040366a..7ac74e406 100644
--- a/public/emoji/1f3e4.svg
+++ b/public/emoji/1f3e4.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#edbb9f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,11 -14,0 0,15 14,0 0,-15 z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(1,18)" id="g22"><path id="path24" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-16 c 0,-1.105 0.896,-2 2,-2 l 30,0 c 1.105,0 2,0.895 2,2 L 34,0 0,0 Z"/></g><path id="path26" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,19 -34,0 0,3 34,0 0,-3 z"/><path id="path28" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,18 -34,0 0,2 34,0 0,-2 z"/><g transform="translate(18,9)" id="g30"><path id="path32" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.657,0 -3,-1.343 -3,-3 l 0,-6 6,0 0,6 C 3,-1.343 1.657,0 0,0"/></g><g transform="translate(28,9)" id="g34"><path id="path36" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.656,0 -3,-1.343 -3,-3 l 0,-4 6,0 0,4 C 3,-1.343 1.657,0 0,0"/></g><g transform="translate(8,9)" id="g38"><path id="path40" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.657,0 -3,-1.343 -3,-3 l 0,-4 6,0 0,4 C 3,-1.343 1.657,0 0,0"/></g><g transform="translate(22,32)" id="g42"><path id="path44" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.792,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.208,0 4,-1.791 4,-4"/></g><path id="path46" style="fill:#edbb9f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,28 -8,0 0,4 8,0 0,-4 z"/><g transform="translate(33,24)" id="g48"><path id="path50" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -30,0 c -1.104,0 -2,-0.895 -2,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(23,28)" id="g52"><path id="path54" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 c -1.104,0 -2,-0.896 -2,-2 L 2,-2 C 2,-0.896 1.105,0 0,0"/></g><g transform="translate(21.667,14.7559)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.204,-0.201 -0.007,-0.403 -0.007,-0.403 l -0.887,-0.888 -1.495,-1.495 -0.004,0.003 c -0.024,-0.027 -0.051,-0.057 -0.078,-0.085 -0.865,-0.864 -2.264,-0.864 -3.127,0 -0.863,0.864 -0.863,2.263 0,3.127 0.863,0.864 2.262,0.864 3.127,0 0.502,-0.505 0.707,-1.19 0.622,-1.846 l 0.895,0.894 c -0.116,0.589 -0.403,1.153 -0.86,1.609 -1.225,1.227 -3.216,1.227 -4.441,0 -1.227,-1.227 -1.227,-3.214 0,-4.442 1.225,-1.226 3.216,-1.226 4.441,0 0.029,0.027 0.052,0.059 0.079,0.085 l 0.003,-0.003 2.385,2.385 c 0,0 0.184,-0.187 0.392,0.016 0.204,0.199 -0.004,0.404 -0.004,0.404 L 0.415,-0.006 C 0.415,-0.006 0.206,0.203 0,0"/></g><g transform="translate(14.2202,12.4209)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.135,0.469 -0.175,0.957 -0.122,1.439 l -0.085,0.084 c -0.824,0.823 -0.33,1.978 -0.495,2.141 -0.164,0.164 -0.329,0 -0.329,0 0,0 -1.77,-1.771 -1.974,-1.977 -0.164,-0.164 0,-0.328 0,-0.328 0.164,-0.164 1.372,0.276 2.088,-0.441 C -0.686,0.686 -0.34,0.34 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EDBB9F" d="M11 10h14v15H11z"/><path fill="#BE1931" d="M1 18v16c0 1.104.896 2 2 2h30c1.104 0 2-.896 2-2V18H1z"/><path fill="#FFE8B6" d="M1 14h34v3H1z"/><path fill="#C1694F" d="M1 16h34v2H1z"/><path fill="#CCD6DD" d="M18 27c-1.657 0-3 1.343-3 3v6h6v-6c0-1.657-1.343-3-3-3z"/><path fill="#AAB8C2" d="M28 27c-1.656 0-3 1.343-3 3v4h6v-4c0-1.657-1.343-3-3-3zM8 27c-1.657 0-3 1.343-3 3v4h6v-4c0-1.657-1.343-3-3-3z"/><circle fill="#D99E82" cx="18" cy="4" r="4"/><path fill="#EDBB9F" d="M14 4h8v4h-8z"/><path fill="#D99E82" d="M33 12H3c-1.104 0-2 .896-2 2h34c0-1.104-.896-2-2-2zM23 8H13c-1.104 0-2 .896-2 2h14c0-1.104-.896-2-2-2z"/><path d="M21.667 21.244c-.204.201-.007.403-.007.403l-.887.888-1.495 1.495-.004-.003-.078.085c-.865.863-2.264.863-3.128 0-.862-.864-.862-2.264 0-3.127.863-.864 2.262-.864 3.128 0 .502.505.707 1.189.622 1.846l.895-.894c-.116-.59-.402-1.153-.859-1.609-1.226-1.226-3.216-1.226-4.442 0-1.227 1.227-1.227 3.214 0 4.442 1.226 1.226 3.216 1.226 4.442 0 .028-.027.052-.06.078-.086l.004.004 2.385-2.386s.184.188.392-.016c.204-.199-.004-.404-.004-.404l-.626-.633c-.001.001-.21-.208-.416-.005zm-7.447 2.335c-.135-.469-.175-.957-.122-1.438l-.085-.085c-.824-.822-.33-1.978-.495-2.141-.164-.164-.329 0-.329 0s-1.77 1.771-1.974 1.977c-.164.164 0 .328 0 .328.164.164 1.372-.275 2.087.441l.918.918z" fill="#FFAC33"/></svg>
\ No newline at end of file