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/1f961.svg b/public/emoji/1f961.svg
index 81fbe98f5..6a05c9c24 100644
--- a/public/emoji/1f961.svg
+++ b/public/emoji/1f961.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="clipPath24" clipPathUnits="userSpaceOnUse"><path id="path26" 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 transform="translate(1.9998,28.9998)" id="g12"><path id="path14" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.001,-29 29,-29 32,0 0,0 Z"/></g><g transform="translate(1.9998,28.9998)" id="g16"><path id="path18" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 3.001,-29 10,0 -1,29 L 0,0 Z"/></g><g id="g20"><g clip-path="url(#clipPath24)" id="g22"><g transform="translate(34.9014,35.4331)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.167,0.347 -0.517,0.567 -0.901,0.567 l -18,0 c -0.304,0 -0.592,-0.138 -0.781,-0.376 l -5.78,-6.624 2.561,0 4.48,5 15.439,0 -6.701,-8.376 c -0.344,-0.431 -0.274,-1.06 0.157,-1.405 0.184,-0.147 0.405,-0.219 0.624,-0.219 0.294,0 0.584,0.128 0.782,0.375 l 8,10 C 0.12,-0.758 0.166,-0.346 0,0"/></g><g transform="translate(30.4949,4)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 2.16,3 10,0 L 0,0 Z"/></g><g transform="translate(27.4219,8)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.429,0 0.768,1 6,0 L 0,0 Z"/></g><g transform="translate(28.8139,10)" id="g40"><path id="path42" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 2.16,3 6,0 L 0,0 Z"/></g><g transform="translate(27.0266,14)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 1.053,1 4,0 L 0,0 Z"/></g><g transform="translate(27.1329,16)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 2.16,3 2,0 L 0,0 Z"/></g><g transform="translate(25.3456,20)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 -0.84,3 0,0 Z"/></g><g transform="translate(14.0077,4)" id="g56"><path id="path58" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.839,0 -7.895,3 -1.581,3 0,0 Z"/></g><g transform="translate(11.5089,8)" id="g60"><path id="path62" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.69,0 -4.345,1 -0.557,1 0,0 Z"/></g><g transform="translate(12.1085,10)" id="g64"><path id="path66" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -6.314,0 -5.369,3 -1.581,3 0,0 Z"/></g><g transform="translate(10.4215,14)" id="g68"><path id="path70" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.788,0 -3.263,1 -0.737,1 0,0 Z"/></g><g transform="translate(10.2093,16)" id="g72"><path id="path74" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.788,0 -2.844,3 -1.581,3 0,0 Z"/></g><g transform="translate(8.5223,20)" id="g76"><path id="path78" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.263,0 -0.95,3 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M34 7H2l3 29h26z"/><path fill="#99AAB5" d="M14 7H2l3 29h10z"/><path fill="#66757F" d="M34.901.567C34.734.22 34.385 0 34 0H16c-.304 0-.591.138-.781.375L9.439 7H12l4.48-5h15.438l-6.7 8.375c-.345.431-.274 1.061.156 1.405.186.148.406.22.625.22.294 0 .584-.128.782-.375l8-10c.24-.3.286-.712.12-1.058z"/><path d="M30.495 32h-14l2.159-3h10zm-3.073-4h-7.429l.768-1h6zm1.392-2h-10l2.159-3h6zm-1.787-4h-6l1.053-1h4zm.106-2h-6l2.159-3h2zm-1.787-4h-2l1.159-3z" fill="#DD2E44"/><path d="M14.008 32H5.169l.944-3h6.314zm-2.499-4h-4.69l.345-1h3.788zm.599-2H5.795l.944-3h3.789zm-1.686-4H6.633l.526-1h2.525zm-.213-2H6.421l.945-3h1.262zm-1.687-4H7.26l.313-3z" fill="#BE1931"/></svg>
\ No newline at end of file