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/1f983.svg b/public/emoji/1f983.svg
index c35118cc4..550b5bbf7 100644
--- a/public/emoji/1f983.svg
+++ b/public/emoji/1f983.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(22.8799,2.9033)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.098,0.18 -0.25,0.302 -0.418,0.391 -1.597,1.706 -0.462,3.707 -0.462,3.707 0,0.552 1,2 0,2 l -1,-1 c -1,-1 -1,-4 -1,-4 l -2,0 c -0.553,0 -1,-0.448 -1,-1 0,-0.553 0.447,-1 1,-1 l 1.108,0 -0.222,-0.12 c -0.486,-0.263 -0.667,-0.87 -0.404,-1.356 0.262,-0.486 0.869,-0.667 1.355,-0.404 l 2.639,1.427 C 0.082,-1.093 0.263,-0.486 0,0"/></g><g transform="translate(15.8799,2.9033)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.097,0.18 -0.249,0.302 -0.417,0.391 -1.597,1.706 -0.463,3.707 -0.463,3.707 0,0.552 1,2 0,2 l -1,-1 c -1,-1 -1,-4 -1,-4 l -2,0 c -0.553,0 -1,-0.448 -1,-1 0,-0.553 0.447,-1 1,-1 l 1.108,0 -0.222,-0.12 c -0.486,-0.263 -0.667,-0.87 -0.404,-1.356 0.262,-0.486 0.869,-0.667 1.355,-0.404 l 2.639,1.427 C 0.082,-1.093 0.263,-0.486 0,0"/></g><g transform="translate(5.1338,29)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2,-5 -3,-5 -2,-7 -1,-9 3,-5 1,0 -1,5 0,0 0,0"/></g><g transform="translate(7,30)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 1.933,-2 0,-2 -1.933,0 -7,1 -7,2 0,1 1.067,3 3,3 1.933,0 4,-1.896 4,-3"/></g><g transform="translate(6,15)" id="g36"><path id="path38" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,6 3.209,13 1,13 -4,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 C 8,21 7,12 5,8 3.326,4.652 2.978,0 0,0"/></g><g transform="translate(36,19)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-7.959 -5,-11.3 -10,-11.249 -2.034,-1.796 -4.927,-2.751 -8,-2.751 -6.627,0 -12,4.836 -12,10.8 0,5.965 5.373,10.8 12,10.8 3,2.7 7,6.5 10,7.4 6,-3.6 8,-7.8 8,-15"/></g><g transform="translate(7,33)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(17.9844,26.5996)" id="g48"><path id="path50" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.626,-0.002 -3.174,-0.297 -4.586,-0.829 -0.672,-0.6 1.766,-0.787 5.017,-2.381 4.094,-0.865 1.625,0 0,0"/></g><g transform="translate(35.9258,21.165)" id="g52"><path id="path54" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.086,1.278 -0.254,2.456 -0.52,3.545 -6.77,2.272 -3.924,0 0,0"/></g><g transform="translate(33.9414,28.3877)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.676,1.154 -1.541,2.205 -2.623,3.186 -9.785,-0.388 -5.629,-1.544 0,0"/></g><g transform="translate(35.1533,13.915)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.402,1.085 -4.247,-0.821 -2.216,-3.415 -2.5,2.344 -4.031,1.063 -3.344,-2 -1.468,2.188 -2.968,0.208 -3.593,-0.749 C -5.393,-6.202 -1.634,-4.32 0,0"/></g><g transform="translate(31.3154,31.5762)" id="g64"><path id="path66" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.937,0.85 -2.029,1.652 -3.315,2.424 -10.315,-1.264 -5.315,-1.982 0,0"/></g><g transform="translate(35.1533,13.916)" id="g68"><path id="path70" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.538,1.424 0.847,3.111 0.847,5.084 0.847,5.839 0.819,6.555 0.772,7.247 -3.838,6.865 -3.028,4.365 0.778,3.896 -2.778,3.834 -3.402,1.646 0,0"/></g><g transform="translate(33.9434,28.3848)" id="g72"><path id="path74" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -6.427,-2.385 -3.693,-4.291 1.462,-3.673 1.134,-2.329 0.653,-1.116 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M22.88 33.097c-.098-.18-.25-.302-.418-.391C20.865 31 22 28.999 22 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.107l-.222.12c-.486.263-.667.869-.404 1.356.263.486.869.667 1.356.404l2.639-1.427c.486-.263.667-.869.404-1.355zm-7 0c-.097-.18-.25-.302-.417-.391C13.866 31 15 28.999 15 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.108l-.222.12c-.486.263-.667.869-.404 1.356.263.486.869.667 1.356.404l2.639-1.427c.485-.263.666-.869.403-1.355z"/><path fill="#BE1931" d="M5.134 7c2 5-3 5-2 7s5-2 3-7-1 0-1 0z"/><path fill="#FFAC33" d="M7 6c0 1.104 1.933 2 0 2S0 7 0 6s1.067-3 3-3 4 1.896 4 3z"/><path fill="#C1694F" d="M6 21C6 15 9.209 8 7 8 3 8 3 6.209 3 4s1.791-4 4-4c7 0 6 9 4 13-1.674 3.348-2.022 8-5 8z"/><path fill="#292F33" d="M36 17c0 7.959-5 11.3-10 11.249C23.966 30.045 21.073 31 18 31c-6.627 0-12-4.836-12-10.8 0-5.965 5.373-10.8 12-10.8 3-2.7 7-6.5 10-7.4 6 3.6 8 7.8 8 15z"/><circle fill="#292F33" cx="6" cy="3" r="1"/><path fill="#66757F" d="M17.984 9.4c-1.626.002-3.174.297-4.585.829 3.914-.229 6.351-.042 9.602 1.552-.923-1.515-3.392-2.381-5.017-2.381zm17.942 5.435c-.086-1.278-.254-2.456-.52-3.545-6.25 1.272-3.404 3.545.52 3.545zm-1.985-7.223c-.676-1.154-1.541-2.205-2.623-3.186-7.162 3.574-3.006 4.73 2.623 3.186zm1.212 14.473c-3.402-1.085-4.247.821-2.215 3.415-2.5-2.344-4.031-1.062-3.344 2-1.469-2.188-2.969-.208-3.594.749 3.761.038 7.52-1.844 9.153-6.164zM31.315 4.424C30.378 3.574 29.286 2.771 28 2c-7 3.688-2 4.406 3.315 2.424zm3.838 17.66C35.691 20.66 36 18.973 36 17c0-.755-.027-1.471-.074-2.163-4.61.382-3.801 2.882.006 3.351-3.557.062-4.181 2.25-.779 3.896zm-1.21-14.469c-6.427 2.385-3.693 4.291 1.462 3.673-.328-1.344-.808-2.557-1.462-3.673z"/></svg>
\ No newline at end of file