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/1f469-1f3ff-200d-2708-fe0f.svg b/public/emoji/1f469-1f3ff-200d-2708-fe0f.svg
index 273621927..1f4a7b6dd 100644
--- a/public/emoji/1f469-1f3ff-200d-2708-fe0f.svg
+++ b/public/emoji/1f469-1f3ff-200d-2708-fe0f.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,0 36,0 36,36 0,36 0,0 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(31,0)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(30,28.5)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.142 -5.372,-7.5 -12,-7.5 -6.627,0 -12,3.358 -12,7.5 0,4.142 5.373,7.5 12,7.5 C -5.372,7.5 0,4.142 0,0"/></g><g transform="translate(17.9443,30.9312)" id="g28"><path id="path30" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.948,-2.053 10.948,-10.948 0,-8.895 0,-10.948 -2.053,-10.948 -2.053,0 -4.79,2.053 -8.895,2.053 -4.105,0 -6.784,-2.053 -8.895,-2.053 -2.287,0 -2.053,8.211 -2.053,10.948 C -10.948,-2.053 -4.105,0 0,0"/></g><g transform="translate(14.3281,8.9805)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-1.98 3.672,-1.98 0.708,0 2.194,0.915 3.66,1.98 l 0,3.205 L 0,3.205 0,0 Z"/></g><g transform="translate(14.3213,10.8213)" id="g36"><path id="path38" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.023,-1.155 2.291,-1.468 3.669,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(9.7339,20.2827)" id="g40"><path id="path42" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.563 8.211,10.563 4.534,0 8.21,-4.729 8.21,-10.563 0,-5.833 -3.676,-10.286 -8.21,-10.286 C 3.676,-10.286 0,-5.833 0,0"/></g><g transform="translate(17.9443,12.457)" id="g44"><path id="path46" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.446,0.794 -2.536,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.265,0.264 0.692,0.266 0.96,0.006 C -1.541,1.826 -1.024,1.367 0,1.367 1.039,1.367 1.557,1.84 1.577,1.859 1.851,2.115 2.28,2.107 2.54,1.84 2.8,1.571 2.8,1.148 2.536,0.885 2.446,0.794 1.606,0 0,0"/></g><g transform="translate(7.7251,17)" id="g48"><path id="path50" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.736,4.051 0.685,0.685 2.053,2.026 2.053,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.718,0 c 0.006,2 0.006,1.924 0.006,3.202 0,8.895 -6.842,12.207 -10.948,12.207 C 6.114,15.409 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(14.6084,18.1138)" id="g52"><path id="path54" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.845 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(21.373,18.1138)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.845 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(18.8369,15.5)" id="g60"><path id="path62" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.691,0 c -0.233,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.114,0.81 -1.924,1 -1.691,1 L 0,1 C 0.232,1 0.423,0.81 0.423,0.576 l 0,-0.153 C 0.423,0.189 0.232,0 0,0"/></g><g transform="translate(8.5,27)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 4.253,2 9.5,2 14.747,2 19,1.105 19,0 19,-1.105 14.747,-2 9.5,-2 4.253,-2 0,-1.105 0,0"/></g><g transform="translate(27.5,28)" id="g68"><path id="path70" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -19,0 0,3.446 C -19,3.446 -15.042,7 -9.5,7 -3.958,7 0,3.446 0,3.446 L 0,0 Z"/></g><g transform="translate(15,31)" id="g72"><path id="path74" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.792 1.343,1 3,1 4.657,1 6,2.792 6,0 6,-1.657 4.657,-2 3,-2 1.343,-2 0,-1.657 0,0"/></g><g transform="translate(16,31)" id="g76"><path id="path78" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.895,2 2,2 3.105,2 4,1.105 4,0 4,-1.105 3.105,-2 2,-2 0.895,-2 0,-1.105 0,0"/></g><g transform="translate(27.5,27)" id="g80"><path id="path82" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -19,0 c -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 L 0,1 C 0.275,1 0.5,0.775 0.5,0.5 0.5,0.225 0.275,0 0,0"/></g><g transform="translate(11.5781,6.9443)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.926,-0.938 c -0.272,-0.043 -0.529,0.143 -0.572,0.416 l -0.157,0.988 c -0.043,0.27 0.144,0.528 0.416,0.571 l 5.926,0.939 C -0.041,2.019 0.216,1.831 0.259,1.561 L 0.416,0.572 C 0.459,0.301 0.272,0.044 0,0"/></g><g transform="translate(7.1338,6.2412)" id="g88"><path id="path90" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,-0.156 -1.301,1.818 -0.313,1.975 0,0 Z"/></g><g transform="translate(9.1089,6.5537)" id="g92"><path id="path94" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,-0.156 -1.301,1.819 -0.313,1.975 0,0 Z"/></g><g transform="translate(11.0845,6.8662)" id="g96"><path id="path98" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,-0.155 -1.301,1.819 -0.313,1.976 0,0 Z"/></g><g transform="translate(30.3477,6.0059)" id="g100"><path id="path102" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.926,0.939 c -0.272,0.043 -0.459,0.3 -0.416,0.573 l 0.157,0.986 c 0.043,0.273 0.3,0.459 0.573,0.416 L 0.313,1.976 C 0.584,1.933 0.772,1.676 0.729,1.403 L 0.572,0.416 C 0.529,0.145 0.272,-0.043 0,0"/></g><g transform="translate(25.9033,6.71)" id="g104"><path id="path106" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,0.156 -0.675,2.132 0.312,1.976 0,0 Z"/></g><g transform="translate(27.8789,6.3975)" id="g108"><path id="path110" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,0.155 -0.675,2.132 0.312,1.975 0,0 Z"/></g><g transform="translate(29.8545,6.084)" id="g112"><path id="path114" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.988,0.156 -0.676,2.133 0.312,1.976 0,0 Z"/></g><g transform="translate(18.001,5.1221)" id="g116"><path id="path118" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.381,-2.494 4.093,-2.778 4.249,-2.841 3.727,0.878 3.727,0.878 l -7.454,0 c 0,0 -0.524,-3.781 -0.232,-3.625 C -3.32,-2.404 0,0 0,0"/></g><g transform="translate(19.3125,2.5625)" id="g120"><path id="path122" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.375,0.625 0.531,0.906 0.183,0.329 0.453,1.571 0.453,1.571 l -2.187,0.961 c 0,0.007 -0.16,-0.005 -0.16,-0.005 L -1.547,3.391 -1.719,3.328 C -1.937,3.258 -1.625,3.32 -1.625,3.313 L -3.599,2.477 c 0,0 0.287,-1.242 0.47,-1.571 C -2.973,0.625 -2.601,0 -2.601,0 c 0,0 -0.753,-0.562 -1.035,-2.563 l 2.325,0 0.019,0 2.323,0 C 0.75,-0.969 0,0 0,0"/></g><g transform="translate(13.2915,9.375)" id="g124"><path id="path126" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.566,-0.566 4.71,-3.383 4.71,-3.383 0,0 -2.127,-1.242 -4.085,-3.534 -0.197,-0.23 -1.542,4.625 -1.583,5.709 C -0.97,-0.905 -0.271,0.271 0,0"/></g><g transform="translate(22.7305,9.375)" id="g128"><path id="path130" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -4.709,-3.383 -4.709,-3.383 0,0 2.126,-1.242 4.084,-3.534 0.196,-0.23 1.542,4.625 1.583,5.709 C 0.97,-0.905 0.271,0.271 0,0"/></g><g transform="translate(18.0156,5.3125)" id="g132"><path id="path134" style="fill:#323a3f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.39,0.022 1.543,-0.771 1.422,-1.25 0.961,-3.077 0.573,-2.641 0.031,-2.641 c -0.611,0 -0.964,-0.472 -1.39,1.313 C -1.452,-0.941 -0.562,-0.031 0,0"/></g><g transform="translate(20.0469,0)" id="g136"><path id="path138" style="fill:#323a3f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.024,0 c 0,0 0.542,2.167 2.019,2.167 C -0.528,2.167 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M31 36v-3.5c0-3.314-3.685-5.5-7-5.5H12c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#292F33" d="M30 7.5c0 4.142-5.372 7.5-12 7.5-6.627 0-12-3.358-12-7.5S11.373 0 18 0c6.628 0 12 3.358 12 7.5"/><path fill="#0B0200" d="M17.944 5.069c4.106 0 10.948 2.053 10.948 10.948s0 10.948-2.053 10.948c-2.054 0-4.79-2.053-8.896-2.053-4.105 0-6.784 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.002-8.895 6.844-10.948 10.949-10.948"/><path fill="#7C533E" d="M14.328 27.02C15.794 28.085 17.292 29 18 29s2.194-.915 3.66-1.98v-3.205h-7.332v3.205z"/><path fill="#664131" d="M14.321 25.179c1.023 1.155 2.291 1.468 3.669 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.339v2.936z"/><path fill="#7C533E" d="M9.734 15.717c0-5.834 3.676-10.563 8.211-10.563 4.534 0 8.211 4.729 8.211 10.563 0 5.833-3.677 10.286-8.211 10.286-4.535 0-8.211-4.452-8.211-10.286"/><path fill="#DF1F32" d="M17.944 23.543c-1.606 0-2.446-.794-2.536-.885-.268-.267-.268-.7 0-.967.265-.265.692-.267.96-.007.035.032.552.491 1.576.491 1.039 0 1.557-.473 1.577-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.536.885"/><path fill="#0B0200" d="M7.725 19c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.685-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112s2.053-1.584 2.053 1.837c0 .244-.023-.531-.04.469h.718c.007-2 .007-1.924.007-3.202 0-8.895-6.843-12.207-10.948-12.207S6.998 6.848 6.998 15.743c0 .793-.02 1.257.008 3.257h.719z"/><path d="M14.608 17.886c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c.001.465-.38.846-.846.846m6.765 0c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .465-.381.846-.846.846"/><path fill="#3D2E24" d="M18.837 20.5h-1.691c-.233 0-.423-.19-.423-.423v-.153c0-.233.19-.424.423-.424h1.691c.232 0 .423.19.423.424v.153c0 .233-.191.423-.423.423"/><path fill="#292F33" d="M8.5 9c0-1.105 4.253-2 9.5-2s9.5.895 9.5 2-4.253 2-9.5 2-9.5-.895-9.5-2"/><path fill="#66757F" d="M27.5 8h-19V4.554S12.458 1 18 1s9.5 3.554 9.5 3.554V8z"/><path fill="#FFAC33" d="M15 5c0-2.792 1.343-1 3-1s3-1.792 3 1c0 1.657-1.343 2-3 2s-3-.343-3-2"/><path fill="#FDCB58" d="M16 5c0-1.105.895-2 2-2s2 .895 2 2-.895 2-2 2-2-.895-2-2m11.5 4h-19c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h19c.275 0 .5.225.5.5s-.225.5-.5.5"/><path fill="#292F33" d="M11.578 29.056l-5.926.938c-.272.043-.529-.144-.572-.416l-.157-.988c-.043-.271.144-.528.416-.571l5.926-.938c.272-.043.529.145.572.415l.157.988c.043.271-.144.528-.416.572"/><path fill="#FDCB58" d="M5.834 27.94l.989-.157.312 1.974-.989.157zm1.973-.313l.987-.156.313 1.975-.988.157zm1.978-.313l.988-.155.31 1.976-.988.155z"/><path fill="#292F33" d="M30.348 29.994l-5.926-.939c-.272-.043-.459-.3-.416-.572l.157-.986c.043-.272.3-.459.572-.416l5.926.938c.271.043.459.3.416.572l-.157.987c-.043.272-.3.459-.572.416"/><path fill="#FDCB58" d="M24.916 29.135l.312-1.975.988.156-.313 1.975zm1.976.312l.31-1.976.989.155-.31 1.976zm1.975.315l.312-1.976.99.156-.313 1.976z"/><path fill="#99AAB5" d="M18.001 30.878s3.381 2.494 4.093 2.778c.156.063-.366-3.656-.366-3.656h-7.454s-.524 3.781-.232 3.625c.639-.343 3.959-2.747 3.959-2.747"/><path fill="#292F33" d="M19.312 33.438s.375-.625.531-.906c.183-.329.453-1.57.453-1.57L18.108 30c0-.007-.16.006-.16.006l-.184.042-.172.062c-.218.07.094.008.094.015l-1.974.837s.287 1.241.47 1.57c.156.281.528.906.528.906s-.753.562-1.035 2.563h4.668c-.281-1.595-1.031-2.563-1.031-2.563"/><path fill="#F5F8FA" d="M13.292 26.625c.566.566 4.709 3.383 4.709 3.383s-2.126 1.242-4.084 3.534c-.197.23-1.542-4.625-1.583-5.709-.012-.303.687-1.479.958-1.208m9.438 0c-.566.566-4.709 3.383-4.709 3.383s2.126 1.242 4.084 3.534c.196.23 1.542-4.625 1.583-5.709.012-.303-.687-1.479-.958-1.208"/><path fill="#323A3F" d="M18.016 30.688c.39-.022 1.543.771 1.422 1.25-.461 1.827-.849 1.391-1.391 1.391-.611 0-.964.473-1.39-1.312-.094-.388.797-1.298 1.359-1.329M20.047 36h-4.024s.542-2.167 2.019-2.167S20.047 36 20.047 36"/></svg>
\ No newline at end of file