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-1f393.svg b/public/emoji/1f469-1f3ff-200d-1f393.svg
index 6822832ba..934565975 100644
--- a/public/emoji/1f469-1f3ff-200d-1f393.svg
+++ b/public/emoji/1f469-1f3ff-200d-1f393.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(31,0)" id="g20"><path id="path22" style="fill:#292f33;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(17.9443,30.9312)" id="g24"><path id="path26" 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(18,1.5889)" id="g28"><path id="path30" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.078,1.948 5.62,7.411 5.62,7.411 l -11.24,0 c 0,0 1.542,-5.463 5.62,-7.411"/></g><g transform="translate(13,9)" id="g32"><path id="path34" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 9.875,0 C 9.875,0 8.619,-3.5 4.937,-3.5 1.256,-3.5 0,0 0,0"/></g><g transform="translate(14.3281,8.9805)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.48 2.172,-1.98 3.672,-1.98 1.5,0 3.66,0.5 3.66,1.98 l 0,3.205 L 0,3.205 0,0 Z"/></g><g transform="translate(14.3213,10.8213)" id="g40"><path id="path42" 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="g44"><path id="path46" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.563 8.21,10.563 4.535,0 8.211,-4.729 8.211,-10.563 0,-5.833 -3.676,-10.286 -8.211,-10.286 C 3.676,-10.286 0,-5.833 0,0"/></g><g transform="translate(17.9443,12.457)" id="g48"><path id="path50" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.605,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.023,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="g52"><path id="path54" 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="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.847,-0.381 0.847,-0.846 l 0,-0.845 C 0.847,0.381 0.465,0 0,0"/></g><g transform="translate(21.373,18.1138)" id="g60"><path id="path62" 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="g64"><path id="path66" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.691,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.114,0.81 -1.925,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(11.4443,20.0645)" id="g68"><path id="path70" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.833,20.0645)" id="g72"><path id="path74" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(18,28)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -14,4 0,7 14,4 0,0 Z"/></g><g transform="translate(6.0625,31.9307)" id="g80"><path id="path82" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 11.938,-3.411 23.875,0 11.938,2.558 0,0 Z m 11.938,-4.431 c -0.047,0 -0.093,0.007 -0.138,0.019 l -14,4 c -0.22,0.064 -0.37,0.269 -0.362,0.498 0.007,0.229 0.17,0.424 0.395,0.472 l 14,3 c 0.069,0.015 0.141,0.015 0.209,0 l 14,-3 C 26.267,0.51 26.43,0.315 26.437,0.086 26.445,-0.143 26.296,-0.348 26.075,-0.412 l -14,-4 C 12.03,-4.424 11.983,-4.431 11.938,-4.431"/></g><g transform="translate(27,28)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -4.029,-3 -9,-3 -4.971,0 -9,0.791 -9,3 0,5 4.029,5 9,5 4.971,0 9,0 9,-5"/></g><g transform="translate(18,32.5)" id="g88"><path id="path90" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -5.429,0 -8.5,-0.209 -8.5,-4.5 -8.5,-6.065 -5.322,-7 0,-7 5.322,-7 8.5,-6.065 8.5,-4.5 8.5,-0.209 5.429,0 0,0 m 0,-8 c -6.215,0 -9.5,1.21 -9.5,3.5 C -9.5,1 -4.885,1 0,1 4.886,1 9.5,1 9.5,-4.5 9.5,-6.79 6.215,-8 0,-8"/></g><g transform="translate(18,27.5)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.045,0 -0.091,0.006 -0.137,0.019 l -14,4 c -0.266,0.076 -0.42,0.353 -0.344,0.618 0.076,0.266 0.356,0.417 0.618,0.344 l 14.001,-4 C 0.403,0.905 0.557,0.628 0.48,0.363 0.418,0.143 0.218,0 0,0"/></g><g transform="translate(17.9995,27.5)" id="g96"><path id="path98" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.217,0 -0.417,0.143 -0.48,0.363 -0.076,0.265 0.078,0.542 0.343,0.618 l 14,4 C 14.131,5.055 14.405,4.902 14.481,4.637 14.557,4.372 14.404,4.095 14.138,4.019 l -14,-4 C 0.092,0.006 0.045,0 0,0"/></g><g transform="translate(5.9995,30.5)" id="g100"><path id="path102" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.257,0 -0.476,0.197 -0.498,0.458 -0.023,0.276 0.182,0.517 0.457,0.54 l 12,1 c 0.272,0.026 0.516,-0.181 0.54,-0.456 0.023,-0.276 -0.182,-0.517 -0.457,-0.54 l -12,-1 C 0.028,0 0.014,0 0,0"/></g><g transform="translate(6,20.5625)" id="g104"><path id="path106" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,9.938 c 0,0.276 0.224,0.5 0.5,0.5 0.276,0 0.5,-0.224 0.5,-0.5 L 0.5,0.5 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(7,22.5)" id="g108"><path id="path110" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.485 -0.448,-4.5 -1,-4.5 -0.552,0 -1,2.015 -1,4.5 0,2.485 0.448,2.5 1,2.5 0.552,0 1,-0.015 1,-2.5"/></g><g transform="translate(8.1001,2.6592)" id="g112"><path id="path114" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(11.1001,2.6592)" id="g116"><path id="path118" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(27.9453,2.6592)" id="g120"><path id="path122" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.25,0 -0.4,-2.659 -0.4,-2.659 l 0.955,0 C 0.555,-2.659 0.361,0 0,0"/></g><g transform="translate(24.9453,2.6592)" id="g124"><path id="path126" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.25,0 -0.4,-2.659 -0.4,-2.659 l 0.955,0 C 0.555,-2.659 0.361,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" 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="#66757F" d="M8.1 33.341c.251 0 .401 2.659.401 2.659h-.956s.193-2.659.555-2.659m3 0c.251 0 .401 2.659.401 2.659h-.957c.001 0 .194-2.659.556-2.659m13.845 0c-.25 0-.4 2.659-.4 2.659h.955s-.193-2.659-.555-2.659m3 0c-.25 0-.4 2.659-.4 2.659h.955s-.193-2.659-.555-2.659"/><path fill="#9266CC" d="M18 34.411C22.078 32.463 23.62 27 23.62 27H12.38s1.542 5.463 5.62 7.411z"/><path fill="#744EAA" d="M13 27h9.875s-1.256 3.5-4.938 3.5S13 27 13 27"/><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.02C14.328 28.5 16.5 29 18 29s3.66-.5 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.21-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.534 0-8.21-4.452-8.21-10.286"/><path fill="#DF1F32" d="M17.944 23.543c-1.605 0-2.446-.794-2.536-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.96-.007.035.032.553.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 d="M14.608 17.886c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846s.847.381.847.846v.845c0 .465-.382.846-.847.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.189-.424.423-.424h1.691c.232 0 .423.19.423.424v.153c0 .233-.191.423-.423.423"/><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 fill="#7C533E" d="M11.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#292F33" d="M32.104 3.511l-14-3c-.068-.015-.14-.015-.209 0l-14 3c-.224.048-.387.243-.395.472-.007.229.142.434.363.498l4.944 1.413C8.615 6.489 8.5 7.176 8.5 8c0 2.29 3.285 3.5 9.5 3.5s9.5-1.21 9.5-3.5c0-.824-.115-1.511-.307-2.106l4.945-1.413c.221-.063.37-.269.362-.498-.008-.229-.171-.424-.396-.472z"/><path fill="#66757F" d="M32.48 3.863c-.076-.265-.35-.417-.618-.344L18 7.48 4.137 3.519c-.262-.073-.542.078-.618.344-.076.265.078.542.344.618l14 4c.045.013.091.019.136.019.045 0 .092-.006.137-.019l14-4c.267-.076.421-.353.344-.618z"/><path fill="#FFCC4D" d="M17.958 3.502l-12 1c-.026.002-.458.057-.458.498v6.095c-.299.186-.5.74-.5 2.405 0 2.485.448 4.5 1 4.5s1-2.015 1-4.5c0-1.665-.201-2.219-.5-2.405V5.46l11.542-.962c.274-.023.479-.264.456-.54-.023-.275-.268-.482-.54-.456z"/></svg>
\ No newline at end of file