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/1f486-1f3fe-200d-2642-fe0f.svg b/public/emoji/1f486-1f3fe-200d-2642-fe0f.svg
index caa12c479..e7d5b9d81 100644
--- a/public/emoji/1f486-1f3fe-200d-2642-fe0f.svg
+++ b/public/emoji/1f486-1f3fe-200d-2642-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(15,14)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(27,9)" id="g24"><path id="path26" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path28" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -1,0 0,4 1,0 0,-4 z"/><path id="path30" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,0 9,0 9,4 10,4 10,0 Z"/><g transform="translate(15,14)" id="g32"><path id="path34" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(9,30.0625)" id="g36"><path id="path38" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11.063 c 0,-4.97 4.029,-8.999 9,-8.999 4.971,0 9,4.029 9,8.999 L 18,-0.312 0,0 Z"/></g><g transform="translate(10.8472,22.2848)" id="g40"><path id="path42" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.801,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.801,2.861 0,1.58 0,0"/></g><g transform="translate(28.7292,22.2848)" id="g44"><path id="path46" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.8,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.8,2.861 0,1.58 0,0"/></g><g transform="translate(18,35.1772)" id="g48"><path id="path50" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.019,0 -10.139,-4.684 -10.139,-8.588 0,-3.903 1.343,-4.986 1.56,-3.903 0.78,3.903 3.119,5.102 3.119,5.102 4.68,-3.904 3.9,-0.781 3.9,-0.781 4.68,-4.684 2.34,0 2.34,0 1.56,-1.562 6.239,-1.562 6.239,-1.562 0,0 0.78,-1.198 1.56,-2.759 0.78,-1.561 1.56,0 1.56,3.903 C 10.139,-4.684 6.239,0 0,0"/></g><g transform="translate(20,14)" id="g52"><path id="path54" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.895,-1 -2,-1 -1.104,0 -2,0.447 -2,1 0,0.553 0.896,1 2,1 1.105,0 2,-0.447 2,-1"/></g><g transform="translate(19,16.5)" id="g56"><path id="path58" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(28.6134,31.603)" id="g60"><path id="path62" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.953,1.953 -0.525,-0.618 -3.5,1.27 0,-1.579 -2.63,-0.607 c -0.603,-0.141 -0.98,-0.743 -0.841,-1.347 0.138,-0.603 0.742,-0.98 1.345,-0.84 l 3.579,0.824 1.791,-1.79 c 0.3,-0.3 0.802,-0.581 1.328,-0.751 l 0.678,-5.587 c 0,0 0,-0.875 0.875,-0.875 0.875,0 0.875,0.875 0.875,0.875 l 0,7 L 0,0 Z"/></g><g transform="translate(28.9572,31.9467)" id="g64"><path id="path66" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.953,1.953 -0.525,2.1 -3.5,0 0,-3.027 -2.63,-0.607 c -0.603,-0.141 -0.98,-0.743 -0.841,-1.347 0.138,-0.603 0.742,-0.98 1.345,-0.84 l 3.579,0.824 1.791,-1.79 c 0.3,-0.3 0.802,-0.581 1.328,-0.751 l 0.678,-5.587 c 0,0 0,-0.875 0.875,-0.875 0.875,0 0.875,0.875 0.875,0.875 l 0,7 L 0,0 Z"/></g><g transform="translate(7.3866,31.603)" id="g68"><path id="path70" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.953,1.953 0.525,-0.618 3.5,1.395 0,-1.704 2.63,-0.607 C 9.211,0.278 9.588,-0.324 9.449,-0.928 9.311,-1.531 8.707,-1.908 8.104,-1.768 l -3.579,0.824 -1.791,-1.79 c -0.3,-0.3 -0.802,-0.581 -1.328,-0.751 L 0.728,-9.072 c 0,0 0,-0.875 -0.875,-0.875 -0.875,0 -0.875,0.875 -0.875,0.875 l 0,7 L 0,0 Z"/></g><g transform="translate(7.0428,31.9467)" id="g72"><path id="path74" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.953,1.953 0.525,2.1 3.5,0 0,-3.027 2.63,-0.607 C 9.211,0.278 9.588,-0.324 9.449,-0.928 9.311,-1.531 8.707,-1.908 8.104,-1.768 l -3.579,0.824 -1.791,-1.79 c -0.3,-0.3 -0.802,-0.581 -1.328,-0.751 L 0.728,-9.072 c 0,0 0,-0.875 -0.875,-0.875 -0.875,0 -0.875,0.875 -0.875,0.875 l 0,7 L 0,0 Z"/></g><g transform="translate(23.9064,20.9441)" id="g76"><path id="path78" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.088,0.071 -0.213,0.074 -0.305,0.007 -0.006,-0.005 -0.631,-0.451 -1.851,-0.451 -1.221,0 -1.846,0.446 -1.85,0.45 -0.092,0.068 -0.217,0.066 -0.306,-0.005 -0.089,-0.071 -0.119,-0.193 -0.073,-0.297 0.03,-0.067 0.75,-1.648 2.229,-1.648 1.479,0 2.199,1.581 2.228,1.648 C 0.118,-0.192 0.088,-0.071 0,0"/></g><g transform="translate(16.4063,20.9441)" id="g80"><path id="path82" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.088,0.071 -0.213,0.074 -0.305,0.007 -0.006,-0.005 -0.631,-0.451 -1.851,-0.451 -1.221,0 -1.846,0.446 -1.85,0.45 -0.092,0.068 -0.217,0.066 -0.306,-0.005 -0.089,-0.071 -0.119,-0.193 -0.073,-0.297 0.03,-0.067 0.75,-1.648 2.229,-1.648 1.479,0 2.199,1.581 2.228,1.648 C 0.118,-0.192 0.088,-0.071 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M15 22v6c0 1.657 1.343 3 3 3s3-1.343 3-3v-6h-6z"/><path fill="#4289C1" d="M27 27H9c-2.209 0-4 1.791-4 4v5h26v-5c0-2.209-1.791-4-4-4z"/><path fill="#2A6797" d="M26 32h1v4h-1zM9 32h1v4H9z"/><path fill="#AF7E57" d="M15 22v6c0 1.657 1.343 3 3 3s3-1.343 3-3v-6h-6z"/><path fill="#AF7E57" d="M9 5.938V17c0 4.971 4.029 9 9 9s9-4.029 9-9V6.25L9 5.938z"/><path fill="#AF7E57" d="M10.847 13.715c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.801-2.861 1.788-2.861s1.788 1.281 1.788 2.861zm17.882 0c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.8-2.861 1.788-2.861s1.788 1.281 1.788 2.861z"/><path fill="#60352A" d="M18 .823c-7.019 0-10.139 4.684-10.139 8.588 0 3.903 1.343 4.986 1.56 3.903.78-3.903 3.12-5.101 3.12-5.101 4.68 3.904 3.9.781 3.9.781 4.679 4.684 2.34 0 2.34 0 1.56 1.562 6.239 1.562 6.239 1.562s.78 1.198 1.559 2.759c.78 1.562 1.56 0 1.56-3.903 0-3.905-3.9-8.589-10.139-8.589z"/><ellipse fill="#915A34" cx="18" cy="22" rx="2" ry="1"/><path fill="#915A34" d="M19 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#90603E" d="M28.613 4.397L26.66 2.444l-.525.619-3.5-1.271v1.58l-2.63.607c-.603.141-.98.743-.841 1.347.138.604.742.98 1.345.841l3.579-.825 1.79 1.791c.3.3.802.581 1.329.751l.678 5.586s0 .875.875.875.875-.875.875-.875v-7l-1.022-2.073z"/><path fill="#AF7E57" d="M28.957 4.053L27.004 2.1 26.479 0h-3.5v3.027l-2.63.607c-.603.141-.98.743-.841 1.347.138.604.742.98 1.345.841l3.579-.825 1.79 1.791c.3.3.802.581 1.329.751l.678 5.586s0 .875.875.875.875-.875.875-.875v-7l-1.022-2.072z"/><path fill="#90603E" d="M7.387 4.397L9.34 2.444l.525.619 3.5-1.396v1.705l2.63.607c.603.141.98.743.841 1.347-.138.604-.742.98-1.345.841l-3.579-.825-1.79 1.791c-.3.3-.802.581-1.329.751l-.678 5.586s0 .875-.875.875-.875-.875-.875-.875v-7l1.022-2.073z"/><path fill="#AF7E57" d="M7.043 4.053L8.996 2.1 9.521 0h3.5v3.027l2.63.607c.603.141.98.743.841 1.347-.138.604-.742.98-1.345.841l-3.579-.825-1.79 1.791c-.3.3-.802.581-1.329.751l-.678 5.586s0 .875-.875.875-.875-.875-.875-.875v-7l1.022-2.072z"/><path d="M23.906 15.056c-.088-.071-.213-.074-.305-.007-.006.005-.63.451-1.851.451-1.22 0-1.845-.446-1.85-.45-.091-.068-.217-.067-.306.004-.089.071-.119.193-.073.297.03.068.751 1.649 2.229 1.649 1.479 0 2.199-1.581 2.229-1.648.046-.104.016-.225-.073-.296zm-7.5 0c-.088-.071-.213-.074-.305-.007-.006.005-.63.451-1.851.451-1.22 0-1.845-.446-1.85-.45-.091-.068-.217-.067-.306.004-.089.071-.119.193-.073.297.03.068.751 1.649 2.229 1.649 1.479 0 2.199-1.581 2.229-1.648.045-.104.016-.225-.073-.296z" fill="#60352A"/></svg>
\ No newline at end of file