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/1f3cd.svg b/public/emoji/1f3cd.svg
index 7384d6b0e..c51ccc347 100644
--- a/public/emoji/1f3cd.svg
+++ b/public/emoji/1f3cd.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(6.5,3)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.933,0 -3.5,1.567 -3.5,3.5 -3.5,5.433 -1.933,7 0,7 1.933,7 3.5,5.433 3.5,3.5 3.5,1.567 1.933,0 0,0 M 0,9 C -3.038,9 -5.5,6.537 -5.5,3.5 -5.5,0.463 -3.038,-2 0,-2 3.038,-2 5.5,0.463 5.5,3.5 5.5,6.537 3.038,9 0,9"/></g><g transform="translate(29.5,3)" id="g24"><path id="path26" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.934,0 -3.5,1.567 -3.5,3.5 -3.5,5.433 -1.934,7 0,7 1.934,7 3.5,5.433 3.5,3.5 3.5,1.567 1.934,0 0,0 M 0,9 C -3.037,9 -5.5,6.537 -5.5,3.5 -5.5,0.463 -3.037,-2 0,-2 3.037,-2 5.5,0.463 5.5,3.5 5.5,6.537 3.037,9 0,9"/></g><g transform="translate(6.5,2.0859)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.485,0 -4.5,2.015 -4.5,4.5 -4.5,6.985 -2.485,9 0,9 2.485,9 4.5,6.985 4.5,4.5 4.5,2.015 2.485,0 0,0 M 0,11 C -3.59,11 -6.5,8.09 -6.5,4.5 -6.5,0.91 -3.59,-2 0,-2 3.59,-2 6.5,0.91 6.5,4.5 6.5,8.09 3.59,11 0,11"/></g><g transform="translate(29.5,2.0859)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.485,0 -4.5,2.015 -4.5,4.5 -4.5,6.985 -2.485,9 0,9 2.485,9 4.5,6.985 4.5,4.5 4.5,2.015 2.485,0 0,0 M 0,11 C -3.59,11 -6.5,8.09 -6.5,4.5 -6.5,0.91 -3.59,-2 0,-2 3.59,-2 6.5,0.91 6.5,4.5 6.5,8.09 3.59,11 0,11"/></g><g transform="translate(7.0015,8.9492)" id="g36"><path id="path38" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,-4 0.999,-2.587 1.999,-0.587 0.905,1.811 3.444,2.429 4.66,0.375 -0.952,3.05 -3.798,5.263 -7.16,5.263 -1.374,0 -2.657,-0.375 -3.764,-1.02 C -1.433,3.865 1.1,2.2 0,0"/></g><g transform="translate(30,7)" id="g40"><path id="path42" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -9,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 9,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(29.9229,5.6943)" id="g44"><path id="path46" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.433,-0.344 -1.062,-0.272 -1.405,0.161 l -5.601,7.045 c -0.344,0.433 -0.271,1.062 0.16,1.405 0.433,0.344 1.062,0.273 1.406,-0.161 L 0.16,1.405 C 0.504,0.973 0.432,0.344 0,0"/></g><g transform="translate(12.4629,15.6328)" id="g48"><path id="path50" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.466,-0.297 0.602,-0.915 0.304,-1.381 l -4.849,-7.582 c -0.298,-0.465 -0.915,-0.601 -1.381,-0.303 -0.466,0.297 -0.602,0.915 -0.304,1.381 l 4.849,7.582 C -1.083,0.162 -0.465,0.299 0,0"/></g><g transform="translate(10.5293,18.6323)" id="g52"><path id="path54" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.811,-0.585 -4.529,-1.632 -1.529,-3.632 3,-2 5.093,-4.125 5.093,-6 0,-2.665 -0.656,-4 0.907,-4 l 7,0 c 0,0 -1,4 2,7 3,3 5,2 8,3 1.897,0.633 4,2 4,3 0,1 0,2 -2,1 -2,-1 -1,-1.551 -3,-0.551 -2,1 -3.16,-0.449 -4.16,-0.449 -1,0 -7.615,-1.68 -8.62,0.049 C 7.138,0.368 5.905,1.368 4.087,1.368 2.769,1.368 0.971,0.7 0,0"/></g><g transform="translate(21,7)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -1.999,0.896 -1.999,2 0,1.105 0.895,2 1.999,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(36.1982,8.9746)" id="g60"><path id="path62" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.277,-3.732 -1.119,2.783 9.277,3.732 L 0,0 Z"/></g><g transform="translate(35.8252,9.9023)" id="g64"><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -9.277,-3.732 -9.65,-2.805 -0.373,0.928 0,0 Z"/></g><g transform="translate(36.1982,8.9746)" id="g68"><path id="path70" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -9.277,-3.732 -9.65,-2.805 -0.373,0.928 0,0 Z"/></g><g transform="translate(19,17.8628)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.366,-0.385 5.645,0.007 6.802,0.098 1.157,0.09 1.594,-0.452 0,-1.25 C 5,-2.053 1.187,-4.313 0,-4.777 -0.998,-5.168 -4.5,-3.566 -4.917,-3.081 -5.333,-2.595 -1.172,0.33 0,0"/></g><g transform="translate(34,19)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.549,-0.04 -3,0 -4,0 -5,0 -5.158,-1.102 -2.451,-1.102 0.256,-1.102 0,0 0,0"/></g><g transform="translate(3.7363,19.0425)" id="g80"><path id="path82" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.465 4.456,5.134 3.975,4.476 2.825,2.903 3.485,1 5.462,1 7.438,1 8.17,-5.519 5.264,-4.042 2.357,-2.566 0,-0.719 0,0"/></g><g transform="translate(8.606,25.4307)" id="g84"><path id="path86" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.704,-0.61 0.345,-1.692 -1.045,-3.485 -2.436,-5.279 -4.627,-6.006 -3.404,-4.027 -2.181,-2.048 0,0 0,0"/></g><g transform="translate(10.5293,18.6323)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.19,-0.476 -0.73,-0.706 -1.206,-0.516 l -0.134,0.054 c -0.476,0.191 -0.707,0.73 -0.516,1.206 l 0.797,1.991 c 0.191,0.476 0.73,0.707 1.206,0.517 L 0.282,3.197 C 0.757,3.007 0.988,2.467 0.798,1.992 L 0,0 Z"/></g><g transform="translate(12.9106,22.0093)" id="g92"><path id="path94" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.094,-0.26 -0.04,-0.546 -0.3,-0.64 l -1.882,-0.679 c -0.259,-0.094 -0.545,0.04 -0.639,0.3 -0.094,0.26 0.04,0.546 0.3,0.641 L -0.64,0.301 C -0.38,0.394 -0.094,0.26 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M6.5 24C3.462 24 1 26.463 1 29.5S3.462 35 6.5 35s5.5-2.463 5.5-5.5S9.538 24 6.5 24zm0 9C4.567 33 3 31.433 3 29.5S4.567 26 6.5 26s3.5 1.567 3.5 3.5S8.433 33 6.5 33zm23-9c-3.037 0-5.5 2.463-5.5 5.5s2.463 5.5 5.5 5.5 5.5-2.463 5.5-5.5-2.463-5.5-5.5-5.5zm0 9c-1.934 0-3.5-1.567-3.5-3.5s1.566-3.5 3.5-3.5 3.5 1.567 3.5 3.5-1.566 3.5-3.5 3.5z"/><path fill="#292F33" d="M6.5 22.914c-3.59 0-6.5 2.91-6.5 6.5s2.91 6.5 6.5 6.5 6.5-2.91 6.5-6.5-2.91-6.5-6.5-6.5zm0 11c-2.485 0-4.5-2.015-4.5-4.5s2.015-4.5 4.5-4.5 4.5 2.015 4.5 4.5-2.015 4.5-4.5 4.5zm23-11c-3.59 0-6.5 2.91-6.5 6.5s2.91 6.5 6.5 6.5 6.5-2.91 6.5-6.5-2.91-6.5-6.5-6.5zm0 11c-2.485 0-4.5-2.015-4.5-4.5s2.015-4.5 4.5-4.5 4.5 2.015 4.5 4.5-2.015 4.5-4.5 4.5z"/><path fill="#77B255" d="M7.001 27.051c-2 4 .999 2.587 1.999.587.905-1.811 3.444-2.429 4.66-.375C12.708 24.213 9.863 22 6.5 22c-1.374 0-2.657.375-3.764 1.02 2.833.165 5.366 1.831 4.265 4.031z"/><path fill="#99AAB5" d="M30 29c0 .553-.447 1-1 1h-9c-.553 0-1-.447-1-1 0-.553.447-1 1-1h9c.553 0 1 .447 1 1z"/><path fill="#99AAB5" d="M29.923 30.306c-.433.344-1.062.272-1.405-.161L22.917 23.1c-.344-.433-.271-1.062.16-1.405.433-.344 1.062-.272 1.405.161l5.601 7.045c.344.432.271 1.061-.16 1.405z"/><path fill="#CCD6DD" d="M12.463 20.367c.466.297.602.915.304 1.381L7.918 29.33c-.298.465-.916.602-1.381.303-.466-.297-.602-.915-.304-1.381l4.849-7.582c.298-.465.916-.602 1.381-.303z"/><path fill="#77B255" d="M10.529 17.368C9.718 17.953 6 19 9 21s5.094 4.125 5.094 6c0 2.665-.656 4 .906 4h7s-1-4 2-7 5-2 8-3c1.897-.633 4-2 4-3s0-2-2-1-1 1.551-3 .551-3.16.449-4.16.449-7.614 1.68-8.62-.049C17.667 17 16.434 16 14.616 16c-1.318 0-3.116.667-4.087 1.368z"/><path fill="#66757F" d="M21 29c0 1.104-.895 2-2 2-1.104 0-2-.896-2-2s.896-2 2-2c1.105 0 2 .896 2 2z"/><path fill="#CCD6DD" d="M25.8 27.975l9.277-3.732 1.12 2.783-9.278 3.732z"/><path fill="#FFF" d="M26.173 28.902l9.277-3.732.373.928-9.277 3.732z"/><path fill="#66757F" d="M26.546 29.83l9.277-3.731.373.927-9.277 3.732z"/><path fill="#292F33" d="M19 18.137c1.366.385 5.645-.007 6.802-.098 1.157-.09 1.594.451 0 1.25C24 20.19 20.188 22.45 19 22.914c-.998.391-4.5-1.211-4.917-1.696-.416-.486 3.745-3.411 4.917-3.081zM34 17c-1.549.04-3 0-4 0s-1.158 1.102 1.549 1.102S34 17 34 17z"/><path fill="#77B255" d="M3.736 16.958c0-1.465 4.456-5.134 3.975-4.476-1.15 1.573-.489 3.476 1.487 3.476S11.907 22.477 9 21c-2.907-1.477-5.264-3.323-5.264-4.042z"/><path fill="#CCD6DD" d="M8.606 10.569c.704.61.345 1.692-1.045 3.485-1.391 1.793-3.583 2.521-2.359.542s3.404-4.027 3.404-4.027z"/><path fill="#66757F" d="M10.529 17.368c-.19.476-.73.706-1.206.516l-.134-.054c-.476-.19-.707-.73-.516-1.206l.798-1.992c.19-.476.73-.707 1.206-.516l.135.054c.476.19.707.73.516 1.206l-.799 1.992z"/><path fill="#292F33" d="M12.911 13.991c.094.26-.04.546-.3.64l-1.881.679c-.26.094-.546-.041-.64-.301-.094-.26.04-.546.3-.64l1.881-.679c.26-.094.546.041.64.301z"/></svg>
\ No newline at end of file