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/1f943.svg b/public/emoji/1f943.svg
index dc49c4872..27750ea6b 100644
--- a/public/emoji/1f943.svg
+++ b/public/emoji/1f943.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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(6.7187,26.0128)" id="g12"><path id="path14" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.948,-21.013 18.5,0 L 22.594,0.706 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(28.5833,16.7708)" id="g24"><path id="path26" style="fill:#e27e00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -21.477,-0.146 c 0,0 1.06,-10.875 3.373,-10.875 l 15.021,0 C -0.721,-11.021 0,0 0,0"/></g><g transform="translate(17.9839,18.5625)" id="g28"><path id="path30" style="fill:#ffb900;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.468,0 -9.901,-0.831 -9.901,-1.855 0,-0.028 0.015,-0.055 0.022,-0.082 0.15,-0.643 2.037,-1.199 4.808,-1.51 l 10.345,0.023 c 2.661,0.315 4.459,0.86 4.605,1.487 0.007,0.027 0.022,0.054 0.022,0.082 C 9.901,-0.831 5.468,0 0,0"/></g><g transform="translate(16.3963,14.8777)" id="g32"><path id="path34" style="fill:#f4bd61;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.937,-0.961 7.41,-0.041 6.845,0.261 C 5.321,0.08 3.522,-0.026 1.588,-0.026 1.046,-0.026 0.518,-0.016 0,0"/></g><g transform="translate(19,17.7083)" id="g36"><path id="path38" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.203,-0.833 3.599,-1.998 c 0.518,-0.015 1.046,-0.026 1.588,-0.026 1.935,0 3.734,0.106 5.257,0.287 L 0,0 Z"/></g><g transform="translate(18.2995,8.2396)" id="g40"><path id="path42" style="fill:#e9ab61;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4.439,1.36 5.507,6.597 0.034,5.677 0,0 Z"/></g><g transform="translate(16.3963,14.8777)" id="g44"><path id="path46" style="fill:#e4973e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.251,0.038 -2.421,0.12 -3.467,0.238 L -3.003,-5.027 1.903,-6.638 1.937,-0.961 0,0 Z"/></g><g transform="translate(12.7969,16.875)" id="g48"><path id="path50" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.132,-1.76 C 1.179,-1.877 2.348,-1.959 3.599,-1.997 L 0,0 Z"/></g><g transform="translate(30.0879,28.1704)" id="g52"><path id="path54" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.649,0.048 -1.217,-0.418 -1.276,-1.064 l -1.478,-16.255 c -0.57,-3.085 -1.957,-4.851 -6.334,-4.851 l -6,0 c -4.596,0 -5.896,1.947 -6.414,5.324 l -1.435,15.782 c -0.059,0.646 -0.624,1.119 -1.276,1.064 -0.646,-0.059 -1.122,-0.63 -1.063,-1.277 l 2.005,-22.049 c 0.255,-1.919 1.41,-3.019 3.165,-3.019 l 16,0 c 2.535,0 3.022,1.737 3.169,3.068 l 2,22 C 1.122,-0.63 0.646,-0.059 0,0"/></g><g transform="translate(31.2,27.0022)" id="g56"><path id="path58" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.85 -4.028,-3.35 -13.2,-3.35 -9.172,0 -13.2,1.5 -13.2,3.35 0,1.851 4.028,3.35 13.2,3.35 C -4.028,3.35 0,1.851 0,0"/></g><g transform="translate(30.5293,26.8975)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.286,0.471 -0.901,0.621 -1.374,0.336 -2.333,-1.416 -8.814,-1.603 -11.121,-1.546 -0.008,0 -0.015,-0.004 -0.022,-0.004 -0.008,0 -0.014,0.004 -0.022,0.004 -2.299,-0.057 -8.785,0.129 -11.121,1.546 -0.471,0.286 -1.087,0.136 -1.373,-0.336 -0.287,-0.472 -0.136,-1.087 0.336,-1.374 2.796,-1.695 9.322,-1.842 11.495,-1.842 0.371,0 0.608,0.004 0.685,0.006 0.078,-0.002 0.315,-0.006 0.685,-0.006 2.174,0 8.7,0.147 11.495,1.842 C 0.136,-1.087 0.286,-0.472 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M6.719 9.987L8.667 31h18.5l2.145-21.719z"/><path fill="#E27E00" d="M28.583 19.229l-21.476.146s1.06 10.875 3.372 10.875H25.5c2.362 0 3.083-11.021 3.083-11.021z"/><path fill="#FFB900" d="M17.984 17.438c-5.468 0-9.901.831-9.901 1.855 0 .028.016.055.022.082.15.642 2.037 1.199 4.809 1.51l10.344-.023c2.661-.315 4.459-.86 4.606-1.486.006-.027.022-.054.022-.082-.001-1.026-4.434-1.856-9.902-1.856z"/><path fill="#F4BD61" d="M16.396 21.122l1.937.961 5.473-.92-.565-.302c-1.523.181-3.322.287-5.257.287-.542 0-1.07-.01-1.588-.026z"/><path fill="#F1F2F2" d="M19 18.292l-6.203.833 3.599 1.997c.518.016 1.046.026 1.588.026 1.935 0 3.734-.106 5.257-.287L19 18.292z"/><path fill="#E9AB61" d="M18.299 27.76l4.439-1.359 1.068-5.238-5.473.92z"/><path fill="#E4973E" d="M16.396 21.122c-1.251-.038-2.421-.12-3.467-.238l.464 5.264 4.906 1.612.034-5.677-1.937-.961z"/><path fill="#D1D3D4" d="M12.797 19.125l.132 1.76c1.046.118 2.216.2 3.467.238l-3.599-1.998z"/><path fill="#8899A6" d="M30.088 7.83c-.649-.048-1.217.418-1.276 1.064l-1.478 16.255C26.764 28.233 25.376 30 21 30h-6c-4.596 0-5.896-1.947-6.414-5.324L7.151 8.894c-.059-.646-.624-1.12-1.276-1.064-.646.059-1.122.63-1.063 1.276l2.005 22.049c.256 1.919 1.41 3.02 3.165 3.02h16c2.535 0 3.022-1.737 3.17-3.068l2-22c.058-.647-.418-1.218-1.064-1.277z"/><path fill="#CCD6DD" d="M31.2 8.998c0 1.85-4.028 3.35-13.2 3.35s-13.2-1.5-13.2-3.35c0-1.851 4.028-3.35 13.2-3.35s13.2 1.499 13.2 3.35z"/><path fill="#FFF" d="M30.529 9.103c-.286-.471-.901-.621-1.374-.336-2.333 1.416-8.813 1.604-11.121 1.546-.008 0-.014.004-.022.004-.007 0-.014-.004-.021-.004-2.3.057-8.785-.129-11.121-1.546-.472-.286-1.087-.137-1.374.336s-.136 1.087.336 1.374c2.795 1.696 9.322 1.842 11.495 1.842.37 0 .607-.004.685-.005.078.001.314.005.685.005 2.173 0 8.7-.147 11.495-1.842.473-.288.623-.902.337-1.374z"/></svg>
\ No newline at end of file