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/1f51c.svg b/public/emoji/1f51c.svg
index 9e308a466..c9aaa2d26 100644
--- a/public/emoji/1f51c.svg
+++ b/public/emoji/1f51c.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(35.3105,29.3481)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10.141,6.389 c -0.904,0.569 -1.644,0.181 -1.644,-0.865 l 0,-1.873 -21.526,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-6 c 0,-1.104 0.896,-2 2,-2 l 21.526,0 0,-1.898 c 0,-1.047 0.722,-1.413 1.607,-0.812 L 0.037,-2.127 C 0.922,-1.527 0.904,-0.57 0,0"/></g><g transform="translate(6.3032,8.7373)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.537 -0.357,-1.018 -0.921,-1.018 -0.563,0 -1.002,0.413 -1.826,0.413 -0.591,0 -1.126,-0.317 -1.126,-0.893 0,-1.414 4.587,-0.509 4.587,-4.052 0,-1.964 -1.621,-3.187 -3.516,-3.187 -1.058,0 -3.338,0.248 -3.338,1.539 0,0.535 0.357,0.975 0.92,0.975 0.646,0 1.415,-0.536 2.308,-0.536 0.907,0 1.401,0.509 1.401,1.182 0,1.62 -4.588,0.644 -4.588,3.832 0,1.923 1.58,3.118 3.407,3.118 C -1.923,1.373 0,1.085 0,0"/></g><g transform="translate(14.8232,5.0557)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.661 -0.866,3.159 -2.582,3.159 -1.717,0 -2.582,-1.498 -2.582,-3.159 0,-1.676 0.837,-3.159 2.582,-3.159 C -0.838,-3.159 0,-1.676 0,0 m -7.307,0 c 0,2.855 1.922,5.055 4.725,5.055 2.76,0 4.725,-2.268 4.725,-5.055 0,-2.844 -1.91,-5.056 -4.725,-5.056 -2.789,0 -4.725,2.212 -4.725,5.056"/></g><g transform="translate(24.7441,5.0557)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.661 -0.864,3.159 -2.581,3.159 -1.718,0 -2.582,-1.498 -2.582,-3.159 0,-1.676 0.838,-3.159 2.582,-3.159 C -0.838,-3.159 0,-1.676 0,0 m -7.306,0 c 0,2.855 1.923,5.055 4.725,5.055 2.76,0 4.725,-2.268 4.725,-5.055 0,-2.844 -1.91,-5.056 -4.725,-5.056 -2.789,0 -4.725,2.212 -4.725,5.056"/></g><g transform="translate(27.6621,8.9561)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.688 0.44,1.072 1.03,1.072 0.261,0 0.687,-0.206 0.866,-0.454 l 4.353,-5.809 0.028,0 0,5.191 c 0,0.688 0.44,1.072 1.032,1.072 0.589,0 1.029,-0.384 1.029,-1.072 l 0,-7.802 c 0,-0.687 -0.44,-1.072 -1.029,-1.072 -0.263,0 -0.675,0.206 -0.867,0.454 l -4.354,5.741 -0.027,0 0,-5.123 C 2.061,-8.489 1.621,-8.874 1.03,-8.874 0.44,-8.874 0,-8.489 0,-7.802 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M35.311 6.652L25.17.263c-.904-.569-1.645-.181-1.645.865V3H2C.896 3 0 3.895 0 5v6c0 1.104.896 2 2 2h21.525v1.899c0 1.046.723 1.413 1.607.811l10.215-6.931c.885-.6.868-1.557-.036-2.127zM6.303 27.263c0 .537-.357 1.018-.921 1.018-.563 0-1.002-.412-1.826-.412-.591 0-1.126.316-1.126.893 0 1.414 4.587.509 4.587 4.052C7.017 34.776 5.396 36 3.501 36c-1.058 0-3.337-.248-3.337-1.539 0-.535.356-.976.92-.976.645 0 1.415.536 2.308.536.907 0 1.401-.509 1.401-1.182 0-1.62-4.588-.645-4.588-3.832 0-1.923 1.58-3.118 3.407-3.118.768.001 2.691.289 2.691 1.374zm1.213 3.681c0-2.855 1.922-5.055 4.725-5.055 2.761 0 4.725 2.268 4.725 5.055 0 2.844-1.91 5.056-4.725 5.056-2.788 0-4.725-2.212-4.725-5.056zm7.307 0c0-1.661-.866-3.159-2.583-3.159s-2.582 1.498-2.582 3.159c0 1.676.838 3.159 2.582 3.159 1.745.001 2.583-1.483 2.583-3.159zm2.615 0c0-2.855 1.923-5.055 4.725-5.055 2.76 0 4.725 2.268 4.725 5.055 0 2.844-1.909 5.056-4.725 5.056-2.789 0-4.725-2.212-4.725-5.056zm7.306 0c0-1.661-.864-3.159-2.581-3.159-1.718 0-2.582 1.498-2.582 3.159 0 1.676.838 3.159 2.582 3.159 1.743.001 2.581-1.483 2.581-3.159zm2.918-3.9c0-.688.44-1.072 1.03-1.072.261 0 .687.206.865.454l4.353 5.81h.028v-5.191c0-.688.439-1.072 1.031-1.072.589 0 1.029.385 1.029 1.072v7.802c0 .688-.44 1.072-1.029 1.072-.263 0-.675-.206-.866-.454l-4.354-5.741h-.027v5.123c0 .688-.44 1.072-1.03 1.072s-1.03-.385-1.03-1.072v-7.803z"/></svg>
\ No newline at end of file