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/261d.svg b/public/emoji/261d.svg
index 8d0720ac9..a0666143a 100644
--- a/public/emoji/261d.svg
+++ b/public/emoji/261d.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(9.9074,17.5457)" id="g20"><path id="path22" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.326,0.002 c 0.498,0.004 0.959,-0.151 1.34,-0.414 L 1.652,1.547 C 1.642,2.908 2.738,4.02 4.099,4.03 l 0.07,0 C 5.531,4.04 6.642,2.944 6.652,1.583 l 0,-0.035 c -0.01,1.381 1.101,2.508 2.482,2.518 1.381,0.01 2.508,-1.102 2.518,-2.482 l 0.031,-4.309 c 0.298,-0.08 0.586,-0.186 0.862,-0.313 l 0.499,5.21 2.959,-0.166 -0.824,-10.007 0.499,0.529 c 0.014,-0.155 0.041,-0.307 0.042,-0.466 l 0.009,-1.117 c 0.021,-3.005 -2.397,-5.459 -5.403,-5.481 l -0.117,0 C 7.337,-14.557 4.974,-12.347 4.751,-9.527 4.595,-9.559 4.433,-9.578 4.267,-9.579 L 4.197,-9.58 C 3.153,-9.587 2.261,-8.942 1.895,-8.029 1.489,-8.38 0.967,-8.603 0.388,-8.607 L 0.062,-8.609 c -1.291,-0.009 -2.356,2.592 -2.357,2.717 L -2.32,-2.354 C -2.329,-1.063 -1.291,-0.009 0,0"/></g><g transform="translate(12.5943,14.2436)" id="g24"><path id="path26" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.013,-1.816 1.495,-3.277 3.312,-3.264 l 9.423,0.067 c 1.816,0.013 3.278,1.495 3.265,3.312 L 15.997,0.539 C 15.984,2.355 14.501,3.816 12.685,3.803 L 3.261,3.735 C 1.445,3.722 -0.016,2.24 -0.003,0.424 L 0,0 Z"/></g><g transform="translate(18.5818,15.9985)" id="g28"><path id="path30" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 6,0.043 -0.015,2 L -0.014,2 0,0 Z"/></g><g transform="translate(22.9011,30.379)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.174,1.993 2.167,1.819 4.159,1.646 3.985,-0.346 3.985,-0.346 l -1.089,-11.983 -0.23,-10e-4 -2,-0.015 -1.782,-0.012 L 0,0 Z"/></g><g transform="translate(7.5971,13.8366)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.008,-1.059 0.871,-1.911 1.93,-1.903 l 0.168,0.001 C 3.156,-1.894 4.007,-1.03 4,0.029 L 3.97,4.195 C 3.962,5.253 3.099,6.105 2.04,6.098 L 1.872,6.097 C 0.814,6.089 -0.038,5.224 -0.03,4.166 L 0,0 Z"/></g><g transform="translate(14.5388,21.9696)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.104,0.008 2.006,-0.881 2.014,-1.986 l 0.02,-2.778 C 1.429,-5.317 1.044,-6.107 1.05,-6.993 1.056,-7.746 1.348,-8.423 1.809,-8.946 1.473,-9.566 0.827,-9.994 0.072,-10 c -1.105,-0.008 -2.007,0.881 -2.015,1.986 l -0.043,6 C -1.994,-0.91 -1.104,-0.008 0,0"/></g><g transform="translate(9.5555,11)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.125,0 C 1.149,0 2.046,0.507 2.566,1.307 2.69,1.125 2.839,0.947 3,0.797 3.049,0.751 3.103,0.704 3.156,0.662 3.276,0.564 3.401,0.471 3.535,0.392 3.602,0.353 3.667,0.316 3.737,0.283 3.877,0.214 4.023,0.159 4.174,0.113 4.241,0.093 4.305,0.067 4.374,0.052 4.596,0.001 4.825,-0.032 5.062,-0.03 c 0.237,0.002 0.461,0.039 0.68,0.094 0.076,0.018 0.149,0.043 0.223,0.068 0.136,0.045 0.267,0.1 0.394,0.164 0.082,0.04 0.162,0.077 0.239,0.125 0.164,0.101 0.317,0.216 0.458,0.344 0.201,0.186 0.381,0.39 0.526,0.622 C 7.581,1.388 7.58,1.389 7.579,1.39 7.781,1.277 8.055,0.991 9.055,0.999 9.587,1.002 10.682,1.01 11.592,1.017 9.793,-0.361 8.584,-2.995 8.605,-6.005 8.607,-6.281 8.833,-6.503 9.109,-6.501 9.385,-6.499 9.607,-6.293 9.605,-6.016 9.578,-2.157 11.742,1 14.43,1 l 0.125,0 c 0.276,0 0.498,0.246 0.496,0.523 -0.002,0.276 -0.227,0.508 -0.503,0.506 l -1.5,-0.006 -4,-0.027 C 7.943,1.988 7.042,2.879 7.034,3.983 7.026,5.087 7.915,5.99 9.019,5.998 l 8,0.058 c 0.5,0.003 1.533,-0.255 1.923,-1.401 l 1.113,-3.578 c 0.105,-0.334 0.492,-1.867 0.426,-2.188 0.035,-4.808 -4.625,-9.842 -10.34,-9.883 C 3.604,-11.041 -1.74,-5.814 -1.929,0.687 -1.47,0.144 -0.739,0 0,0"/></g><g transform="translate(17.5675,17.9913)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.014,2 C -0.022,3.104 0.867,4.006 1.971,4.014 3.076,4.022 3.978,3.133 3.986,2.029 L 4,0.029 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M15.94 15.838c-.01-1.379 1.108-2.505 2.488-2.515 1.379-.01 2.423 1.1 2.433 2.479l-.006 4.303s1.844 11.797-5.428 11.797-8.414-8.673-8.414-8.673l-.025-2.241c-.01-1.29 8.952-5.15 8.952-5.15z"/><path fill="#FFDC5D" d="M20.936 16.957v-2.044c-.008-1.103-.909-1.991-2.012-1.983-1.103.008-1.991.909-1.983 2.012l.012 2.016h3.983zm2.593 2.684c-1.107 0-2.013-.906-2.013-2.013V4.712c0-1.107.906-2.013 2.013-2.013 1.107 0 2.013.906 2.013 2.013v12.916c0 1.107-.906 2.013-2.013 2.013zM9 23c-1.107 0-2.013-.906-2.013-2.013V17.01c0-1.107.906-2.013 2.013-2.013 1.107 0 2.013.906 2.013 2.013v3.977C11.012 22.094 10.106 23 9 23z"/><path fill="#EF9645" d="M13.193 22.033c-1.2 0-2.181-.982-2.181-2.181V15.54c0-1.2.982-2.181 2.181-2.181 1.2 0 2.181.982 2.181 2.181v4.311c0 1.2-.981 2.182-2.181 2.182zm14.773-1.889c-.013-1.814-1.494-3.274-3.308-3.261h-7.87l.013 6.992h7.907c1.814-.013 3.274-1.494 3.261-3.308l-.003-.423z"/><path fill="#FFDC5D" d="M13.93 12.965c1.103-.008 2.004.88 2.012 1.983v2.793c-.605.553-.969 1.324-.963 2.209.005.752.297 1.429.758 1.951-.336.619-.982 1.047-1.736 1.052-1.103.008-2.004-.88-2.012-1.983l-.043-5.993c-.007-1.103.881-2.004 1.984-2.012z"/><path fill="#FFDC5D" d="M27.873 19.273c-.39-1.145-1.422-1.403-1.921-1.399h-7.961c-1.107 0-2.013.906-2.013 2.013s.906 2.013 2.013 2.013l5.493-.003c.276-.002.501.229.503.505.002.276-.22.522-.496.522h-.125c-2.685 0-4.847 3.153-4.819 7.008.002.276-.22.482-.496.484-.276.002-.501-.22-.503-.496-.022-3.006 1.187-5.637 2.983-7.013l-2.534.018c-.999.007-1.273-.278-1.475-.391l.003.003c-.145.232-.922 1.416-2.516 1.416-1.723 0-2.37-1.154-2.494-1.335-.519.799-1.443 1.306-2.516 1.306-.714 0-1.529-.188-1.987-.731.146 6.662 5.541 11.759 12.07 11.712 5.708-.041 10.362-5.069 10.328-9.871-.098-2.659-1.537-5.761-1.537-5.761z"/></svg>
\ No newline at end of file