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-1f3fe-200d-2695-fe0f.svg b/public/emoji/1f469-1f3fe-200d-2695-fe0f.svg
index 1f1492f76..a6b5ffc45 100644
--- a/public/emoji/1f469-1f3fe-200d-2695-fe0f.svg
+++ b/public/emoji/1f469-1f3fe-200d-2695-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,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:#3b88c3;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(17.9453,32.0215)" id="g24"><path id="path26" style="fill:#60352a;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(10.5,3.5)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c 0,4.094 1.877,8.5 6,8.5 l 0,-2 C 0.836,6.5 0,2.248 0,0"/></g><g transform="translate(26.5,7.5)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c 0,0.411 -0.521,2.5 -3,2.5 l 0,2 C -1.467,4.5 0,1.569 0,0"/></g><g transform="translate(12.5,3.5)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -1.343,-3 -3,-3 -1.657,0 -3,1.344 -3,3 0,1.656 1.343,3 3,3 1.657,0 3,-1.344 3,-3"/></g><g transform="translate(11.5,3.5)" id="g40"><path id="path42" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.105,0 -2,0.896 -2,2 0,1.104 0.895,2 2,2 1.105,0 2,-0.896 2,-2"/></g><g transform="translate(29.5,2)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2,0.835 -2.108,5 -4.25,5 -6.392,5 -6.5,0.835 -6.5,0 l -2,0 c 0,4.383 1.589,7 4.25,7 C -1.589,7 0,4.383 0,0"/></g><g transform="translate(23,2)" id="g48"><path id="path50" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(29.5,2)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(14.5,13.5908)" id="g56"><path id="path58" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.591 3.5,-5 3.5,5 L 7,0 0,0 Z"/></g><g transform="translate(14.5,12)" id="g60"><path id="path62" style="fill:#9b6a49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.023,-1.155 2.112,-1.5 3.49,-1.5 4.869,-1.5 5.978,-1.155 7,0 l 0,2.936 -7,0 L 0,0 Z"/></g><g transform="translate(9.7339,21.373)" id="g64"><path id="path66" style="fill:#af7e57;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(17.9453,13.5479)" id="g68"><path id="path70" 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.7251,18.0908)" id="g72"><path id="path74" style="fill:#60352a;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.005,2 0.005,1.924 0.005,3.202 0,8.895 -6.841,12.207 -10.948,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.6084,19.2041)" id="g76"><path id="path78" style="fill:#60352a;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.373,19.2041)" id="g80"><path id="path82" style="fill:#60352a;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(18.8359,16.5908)" id="g84"><path id="path86" style="fill:#915a34;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.4443,21.1553)" id="g88"><path id="path90" style="fill:#af7e57;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,21.1553)" id="g92"><path id="path94" style="fill:#af7e57;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></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M31 36v-4.5c0-3.314-3.56-5.5-6.875-5.5h-12C8.812 26 5 28.186 5 31.5V36h26z"/><path fill="#60352A" d="M17.945 3.978c4.105 0 10.947 2.053 10.947 10.947 0 8.896 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.001-8.894 6.844-10.947 10.949-10.947"/><path fill="#292F33" d="M10.5 32.5h-2c0-4.094 1.877-8.5 6-8.5v2c-3.164 0-4 4.252-4 6.5zm16-4h-2c0-.411-.521-2.5-3-2.5v-2c3.533 0 5 2.931 5 4.5z"/><circle fill="#CCD6DD" cx="9.5" cy="32.5" r="3"/><circle fill="#F5F8FA" cx="9.5" cy="32.5" r="2"/><path fill="#292F33" d="M29.5 34h-2c0-.835-.108-5-2.25-5S23 33.165 23 34h-2c0-4.383 1.589-7 4.25-7s4.25 2.617 4.25 7z"/><circle fill="#CCD6DD" cx="22" cy="34" r="1"/><circle fill="#CCD6DD" cx="28.5" cy="34" r="1"/><path fill="#AF7E57" d="M14.5 22.409V26l3.5 5 3.5-5v-3.591z"/><path fill="#9B6A49" d="M14.5 24c1.023 1.155 2.112 1.5 3.49 1.5 1.379 0 2.487-.345 3.51-1.5v-2.937h-7V24z"/><path fill="#AF7E57" d="M9.734 14.627c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.73 8.209 10.563s-3.676 10.285-8.209 10.285c-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DF1F32" d="M17.945 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.02.26.269.26.691-.004.955-.089.091-.929.885-2.535.885"/><path fill="#60352A" d="M7.725 17.909c-.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.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.023-.531-.04.469h.719c.006-2 .006-1.924.006-3.202 0-8.894-6.842-12.207-10.948-12.207-4.105 0-10.948 3.257-10.948 12.152 0 .793-.02 1.257.008 3.257h.72z"/><path fill="#60352A" d="M14.608 16.796c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#915A34" d="M18.836 19.409h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .234-.191.423-.424.423"/><path fill="#AF7E57" d="M11.444 14.845c0 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.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.623 1.639 1.174 1.639 2.623"/></svg>
\ No newline at end of file