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-1f3fb-200d-1f4bc.svg b/public/emoji/1f469-1f3fb-200d-1f4bc.svg
index 60bf35290..ebd3e39df 100644
--- a/public/emoji/1f469-1f3fb-200d-1f4bc.svg
+++ b/public/emoji/1f469-1f3fb-200d-1f4bc.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:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,4.5 C 0,7.814 -3.561,10 -6.875,10 l -12,0 C -22.188,10 -26,7.814 -26,4.5 L -26,0 0,0 Z"/></g><g transform="translate(18.2004,32.0215)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.947,-2.053 10.947,-10.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.79,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.895,-2.052 -2.288,0 -2.054,8.21 -2.054,10.948 C -10.949,-2.053 -4.105,0 0,0"/></g><g transform="translate(23.25,10)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.182,-10 -7.273,-10 -10,0"/></g><g transform="translate(14,10)" id="g32"><path id="path34" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.499,0 -1,-5.5 L 0.5,-6.5 0,-10 3.5,-10 0,0 Z"/></g><g transform="translate(22.5,10)" id="g36"><path id="path38" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.5,0 2,-5.5 -1,-6.5 -0.5,-10 -4,-10 0,0 Z"/></g><g transform="translate(14.7551,10)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-1.982 2.792,-4.5 3.5,-4.5 0.708,0 2.512,2.549 3.5,4.5 l 0,3.591 -7,0 L 0,0 Z"/></g><g transform="translate(14.7551,11.9459)" id="g44"><path id="path46" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.975,-1.102 2.185,-1.4 3.499,-1.4 4.814,-1.4 6.025,-1.102 7,0 l 0,2.801 -7,0 L 0,0 Z"/></g><g transform="translate(9.989,21.373)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.564 8.211,10.564 4.534,0 8.209,-4.73 8.209,-10.564 0,-5.833 -3.675,-10.285 -8.209,-10.285 C 3.676,-10.285 0,-5.833 0,0"/></g><g transform="translate(18.2004,13.5479)" id="g52"><path id="path54" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(7.9802,18.0908)" id="g56"><path id="path58" style="fill:#292f33;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.737,4.051 0.684,0.685 2.052,2.026 2.052,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.719,0 c 0.006,2 0.006,1.924 0.006,3.202 0,8.895 -6.842,12.207 -10.949,12.207 C 6.115,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.8635,19.2041)" id="g60"><path id="path62" style="fill:#662113;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.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(21.6281,19.2041)" id="g64"><path id="path66" style="fill:#662113;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.847 l 0,0.844 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.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(19.091,16.5908)" id="g68"><path id="path70" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(11.6994,21.1553)" id="g72"><path id="path74" style="fill:#f7dece;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(28.0881,21.1553)" id="g76"><path id="path78" style="fill:#f7dece;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(27.2561,22.0005)" id="g80"><path id="path82" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.018,0 -0.035,0 -0.053,0.002 -0.274,0.029 -0.473,0.275 -0.445,0.55 0.004,0.038 0.369,3.856 -1.965,6.444 -1.461,1.619 -3.679,2.44 -6.593,2.44 -5.911,0 -7.968,-3.368 -8.652,-6.193 -0.065,-0.269 -0.336,-0.436 -0.604,-0.368 -0.269,0.064 -0.433,0.334 -0.368,0.603 0.629,2.599 2.717,6.958 9.624,6.958 3.214,0 5.684,-0.934 7.341,-2.777 C 0.917,4.734 0.515,0.621 0.496,0.447 0.469,0.19 0.252,0 0,0"/></g><g transform="translate(26.2551,23.5)" id="g84"><path id="path86" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,0.5 0.5,0.5 l 1.5,0 c 0,0 1,0 1,-1 L 3,-4 C 3,-4 3,-5 2,-5 L 0.5,-5 C 0.5,-5 0,-5 0,-4.5 L 0,0 Z"/></g><g transform="translate(9.7551,24)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,2 C -1.5,2.776 -1.276,3 -1,3 L 0,3 C 0.276,3 0.5,2.776 0.5,2.5 l 0,-2 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(19.7551,11)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 6.44,1 6.981,7.747 7.001,8.034 L 7.999,7.967 C 7.993,7.887 7.383,0 0,0"/></g><g transform="translate(16.2551,11)" id="g96"><path id="path98" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 0.447,-1 1,-1 l 2,0 c 0.553,0 1,0.447 1,1 L 4,1 C 4,1.553 3.553,2 3,2 L 1,2 C 0.447,2 0,1.553 0,1 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DC" d="M30 26c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h22c2.209 0 4 1.791 4 4v22z"/><path fill="#F5F8FA" d="M28 26c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2V4c0-1.104.896-2 2-2h22c1.104 0 2 .896 2 2v22z"/><path fill="#50A5E6" d="M6 26c-.552 0-1-.447-1-1V13c0-.552.448-1 1-1s1 .448 1 1v12c0 .553-.448 1-1 1z"/><path fill="#77B255" d="M10 26c-.552 0-1-.447-1-1V8c0-.552.448-1 1-1s1 .448 1 1v17c0 .553-.448 1-1 1z"/><path fill="#226798" d="M36 36v-4.5c0-3.314-3.561-5.5-6.875-5.5h-12C13.812 26 10 28.186 10 31.5V36h26z"/><path fill="#F4F7F9" d="M28.25 26l-3.182 10h-4.091L18.25 26"/><path fill="#3A87C2" d="M19 26h-1.5l-1 5.5 3 1L19 36h3.5zm8.5 0H29l.5 5.5-3 1L27 36h-3.5z"/><path fill="#292F33" d="M23.2 3.979c4.104 0 10.947 2.053 10.947 10.947 0 8.895 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.106 0-6.785 2.053-8.896 2.053-2.287 0-2.053-8.211-2.053-10.948.002-8.895 6.845-10.947 10.95-10.947"/><path fill="#F6DDCD" d="M19.755 26c1 1.982 2.792 4.5 3.5 4.5s2.512-2.549 3.5-4.5v-3.591h-7V26z"/><path fill="#ECC0AC" d="M19.755 24.054c.975 1.102 2.185 1.4 3.499 1.4 1.315 0 2.526-.298 3.501-1.4v-2.801h-7v2.801z"/><path fill="#F6DDCD" d="M14.989 14.627c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.729 8.209 10.563 0 5.833-3.676 10.285-8.209 10.285-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DE2032" d="M23.2 22.452c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.019.26.269.26.691-.004.955-.089.092-.929.886-2.535.886"/><path fill="#C1694F" d="M24.091 19.409h-1.69c-.233 0-.423-.189-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .234-.191.423-.424.423"/><path fill="#662213" d="M26.628 16.796c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847m-6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847"/><path fill="#292F33" d="M12.98 17.909c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.438 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.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.022-.531-.04.469h.719c.006-2 .006-1.924.006-3.202C34.148 5.813 27.306 2.5 23.2 2.5c-4.104 0-10.947 3.257-10.947 12.152 0 .793-.02 1.257.008 3.257h.719z"/><path fill="#F6DDCD" d="M33.088 14.845c0 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.623 1.639 1.175 1.639 2.623m-16.389 0c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623 1.639 1.175 1.639 2.623"/></svg>
\ No newline at end of file