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/1f95e.svg b/public/emoji/1f95e.svg
index 1a1769b0c..795fb1341 100644
--- a/public/emoji/1f95e.svg
+++ b/public/emoji/1f95e.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><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" d="m 25.2188,19.3437 2.4687,0 0,-8.0983 -2.4687,0 0,8.0983 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(36,13)" id="g20"><path id="path22" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(36,15)" id="g24"><path id="path26" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(31,16)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.988 -5.82,-7.223 -13,-7.223 -7.18,0 -13,3.235 -13,7.223 0,3.988 5.82,7.222 13,7.222 C -5.82,7.222 0,3.988 0,0"/></g><g transform="translate(31,18)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.988 -5.82,-7.223 -13,-7.223 -7.18,0 -13,3.235 -13,7.223 0,3.988 5.82,7.222 13,7.222 C -5.82,7.222 0,3.988 0,0"/></g><g transform="translate(31,20)" id="g36"><path id="path38" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.988 -5.82,-7.223 -13,-7.223 -7.18,0 -13,3.235 -13,7.223 0,3.988 5.82,7.222 13,7.222 C -5.82,7.222 0,3.988 0,0"/></g><g transform="translate(31,22)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.988 -5.82,-7.223 -13,-7.223 -7.18,0 -13,3.235 -13,7.223 0,3.988 5.82,7.222 13,7.222 C -5.82,7.222 0,3.988 0,0"/></g><g transform="translate(31,24)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.988 -5.82,-7.223 -13,-7.223 -7.18,0 -13,3.235 -13,7.223 0,3.988 5.82,7.222 13,7.222 C -5.82,7.222 0,3.988 0,0"/></g><g transform="translate(16.625,25.2344)" id="g48"><path id="path50" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.009 -0.007,-0.016 -0.016,-0.016 l -0.031,0 c -0.009,0 -0.015,0.007 -0.015,0.016 0,0.009 0.006,0.016 0.015,0.016 l 0.031,0 C -0.007,0.016 0,0.009 0,0"/></g><g transform="translate(15.5313,29.0313)" id="g52"><path id="path54" style="fill:#d3790d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.688,1.125 -5.242,0.558 -5,-2.344 0.063,-0.75 -0.969,-2 -2,-2.719 -2.398,-1.671 -1.368,-4.465 2.75,-2.406 2.062,1.031 5.07,0.961 8.719,-0.156 3.062,-0.938 4.958,-2.073 5.208,-3.448 1.215,0.398 1.886,0.771 2.479,1.271 -0.252,0.57 -1.375,2.208 -3.156,2.989 -3.369,1.478 -0.115,3.607 2.406,4.125 2.282,0.469 0.032,2.188 -3.437,2.126 C 4.5,-0.625 5.372,-1.639 0,0"/></g><g id="g56"><g id="g58"/><g id="g64"><g style="opacity:0.5" id="g66" clip-path="url(#clipPath60)"><g id="g68" transform="translate(25.2188,18)"><path id="path70" style="fill:#d3790d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.844 0.062,-4.568 0.062,-5.562 0,-1.938 2.376,-1.594 2.376,1.624 0,3.219 0.031,5.282 0.031,5.282 L 0,0 Z"/></g></g></g></g><g transform="translate(21.5352,27.4028)" id="g72"><path id="path74" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,-0.223 0.392,-1.583 0,-1.806 l -2.828,-1.612 c -0.391,-0.223 -1.024,-0.223 -1.414,0 l -2.829,1.612 c -0.391,0.223 -0.391,1.583 0,1.806 l 2.829,0.612 c 0.39,0.223 1.023,0.223 1.414,0 L 0,0 Z"/></g><g transform="translate(21.5352,27.4028)" id="g76"><path id="path78" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,-0.223 0.392,-0.583 0,-0.806 l -2.828,-1.612 c -0.391,-0.223 -1.024,-0.223 -1.414,0 l -2.829,1.612 c -0.391,0.223 -0.391,0.583 0,0.806 l 2.829,1.612 c 0.39,0.223 1.023,0.223 1.414,0 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#929497" cx="18" cy="23.949" rx="18" ry="10"/><ellipse fill="#CCD6DC" cx="18" cy="22.199" rx="18" ry="10"/><path fill="#F19020" d="M32 20.393c0 4.295-6.268 7.778-14 7.778S4 24.688 4 20.393s6.268-7.778 14-7.778 14 3.483 14 7.778z"/><path fill="#FAAA35" d="M32 18.239c0 4.295-6.268 7.778-14 7.778S4 22.534 4 18.239s6.268-7.778 14-7.778 14 3.483 14 7.778z"/><path fill="#F19020" d="M32 16.085c0 4.295-6.268 7.778-14 7.778S4 20.381 4 16.085s6.268-7.778 14-7.778 14 3.483 14 7.778z"/><path fill="#FAAA35" d="M32 13.932c0 4.295-6.268 7.778-14 7.778S4 18.227 4 13.932s6.268-7.778 14-7.778 14 3.482 14 7.778z"/><path fill="#F19020" d="M32 11.778c0 4.295-6.268 7.778-14 7.778S4 16.073 4 11.778 10.268 4 18 4s14 3.483 14 7.778z"/><path fill="#E18524" d="M28.316 23.498c-.726.439-1.542.832-2.431 1.17.119.557.468.846.87.846.601 0 1.32-.647 1.561-2.016"/><path fill="#E5922E" d="M28.401 21.292c-.765.471-1.632.89-2.583 1.247.013.708.024 1.262.024 1.691 0 .161.015.307.043.438.889-.337 1.705-.73 2.431-1.17.053-.304.083-.643.083-1.018l.002-1.188"/><path fill="#E18524" d="M28.41 19.132c-.776.479-1.658.905-2.625 1.265.009.834.021 1.543.032 2.142.95-.356 1.818-.775 2.583-1.247.003-.829.006-1.553.01-2.16"/><path fill="#E5922E" d="M28.433 16.955l-2.658 1.284c0 .799.005 1.516.011 2.158.967-.36 1.849-.786 2.625-1.265.009-1.401.022-2.177.022-2.177"/><path fill="#D17A28" d="M15.341 6.359c-3.971-1.211-5.645-.6-5.384 2.524.067.808-1.043 2.154-2.154 2.928-2.583 1.8-1.473 4.809 2.962 2.591 2.221-1.11 5.46-1.035 9.389.168 3.298 1.01 5.351 2.187 5.62 3.668.875-.296 1.942-.759 2.659-1.284-.271-.614-1.481-2.418-3.399-3.259-3.628-1.591-.124-3.884 2.591-4.442 2.457-.505.034-2.356-3.702-2.288-3.735.068-2.796 1.16-8.582-.606z"/><path fill="#FAAA35" d="M22.122 8.571s.107 1.247-.315 1.487l-3.046 1.736c-.421.24-1.102.24-1.523 0l-3.046-1.736c-.421-.24-.316-1.511-.316-1.511l8.246.024z"/><path fill="#FFD882" d="M21.807 8.113c.221.126.326.293.315.458-.01.149-.115.296-.315.41l-3.046 1.736c-.421.24-1.102.24-1.523 0l-3.046-1.736c-.21-.12-.316-.277-.316-.434 0-.157.105-.314.316-.434l3.046-1.736c.421-.24 1.102-.24 1.523 0l3.046 1.736z"/></svg>
\ No newline at end of file