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/1f590-1f3fe.svg b/public/emoji/1f590-1f3fe.svg
index 1fe6d0be7..74ed3da4f 100644
--- a/public/emoji/1f590-1f3fe.svg
+++ b/public/emoji/1f590-1f3fe.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(11.1357,16.9619)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.259,-0.967 -0.314,-1.961 -1.281,-2.221 l -0.363,-0.096 c -0.966,-0.259 -1.96,0.314 -2.219,1.281 l -3.203,11.953 c -0.259,0.967 0.315,1.962 1.282,2.221 l 0.361,0.096 c 0.967,0.26 1.961,-0.314 2.221,-1.281 L 0,0 Z"/></g><g transform="translate(15.9312,18.9019)" id="g24"><path id="path26" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.159,-1.023 -0.542,-1.982 -1.564,-2.14 l -0.248,-0.039 c -1.023,-0.158 -1.982,0.542 -2.14,1.565 l -2.34,15.07 c -0.16,1.023 0.541,1.981 1.564,2.14 l 0.248,0.039 c 1.023,0.158 1.982,-0.542 2.141,-1.566 L 0,0 Z"/></g><g transform="translate(20.5957,19.0186)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.058,-1.011 -0.925,-1.783 -1.937,-1.726 l -0.244,0.014 c -1.013,0.06 -1.785,0.925 -1.727,1.937 l 0.858,14.899 c 0.058,1.011 0.926,1.785 1.938,1.727 l 0.244,-0.015 C 0.144,16.779 0.915,15.911 0.858,14.899 L 0,0 Z"/></g><g transform="translate(25.1875,17.0596)" id="g32"><path id="path34" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.219,-0.941 -1.157,-1.528 -2.101,-1.31 l -0.486,0.113 c -0.942,0.218 -1.528,1.158 -1.31,2.1 l 3.273,14.125 c 0.219,0.941 1.158,1.529 2.1,1.31 l 0.487,-0.112 c 0.942,-0.219 1.527,-1.16 1.31,-2.101 L 0,0 Z"/></g><g transform="translate(28.9268,8.6406)" id="g36"><path id="path38" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.523,-0.903 -1.677,-1.213 -2.581,-0.691 L -2.773,-0.58 C -3.677,-0.059 -3.986,1.097 -3.464,2 l 5.609,9.718 c 0.523,0.903 1.678,1.214 2.582,0.692 L 4.919,12.299 C 5.823,11.777 6.132,10.621 5.61,9.718 L 0,0 Z"/></g><g transform="translate(6.1826,19.9932)" id="g40"><path id="path42" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.48,-2.343 -0.183,-5.186 -0.183,-7.993 0,-2.808 2.125,-12 12,-12 9.875,0 10.5,8.234 12,10.666 1.5,2.432 -0.369,6.514 -1.813,4.704 -1.957,-2.453 -3.466,-2.053 -2.646,2.69 C 19.97,1.604 16.394,3.311 15.756,0.119 15.263,-2.348 14.457,-1.833 14.57,0.894 14.707,4.177 10.891,4.535 10.695,0.803 10.552,-1.904 9.646,-0.748 9.373,1.077 9.138,2.64 4.983,3.798 5.359,1.396 5.952,-2.389 5.177,-3.438 3.901,0.673 3.096,3.267 -0.48,2.343 0,0"/></g><g transform="translate(25.9648,13.9473)" id="g44"><path id="path46" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.3,0.122 -0.51,0.486 -0.599,1.114 -2.49,0.855 -4.995,0.345 -6.965,-1.581 c -2.555,-2.499 -2.991,-5.2 -2.971,-7.007 0.017,-1.457 0.812,-2.146 1.045,0.012 C -8.597,-5.85 -6.647,-0.448 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M11.136 19.038c.259.967-.314 1.961-1.281 2.221l-.362.097c-.967.259-1.961-.314-2.22-1.281L4.069 8.121c-.258-.967.316-1.962 1.283-2.221l.361-.097c.967-.26 1.961.314 2.221 1.281l3.202 11.954zm4.795-1.94c.159 1.023-.542 1.982-1.564 2.14l-.248.039c-1.023.158-1.981-.542-2.14-1.565l-2.34-15.07c-.16-1.023.542-1.981 1.564-2.14l.248-.039c1.023-.159 1.982.542 2.141 1.565l2.339 15.07zm4.665-.117c-.058 1.011-.925 1.783-1.937 1.726l-.244-.015c-1.013-.059-1.785-.925-1.727-1.937l.857-14.898C17.604.846 18.471.072 19.483.13l.244.014c1.012.058 1.783.926 1.727 1.938l-.858 14.899zm4.592 1.959c-.219.941-1.157 1.528-2.101 1.31l-.486-.112c-.942-.219-1.528-1.158-1.311-2.1l3.273-14.125c.219-.941 1.158-1.528 2.1-1.31l.487.113c.942.219 1.527 1.159 1.31 2.1L25.188 18.94zm3.739 8.419c-.522.903-1.677 1.213-2.581.691l-.191-.111c-.904-.522-1.214-1.677-.691-2.58l5.609-9.718c.522-.903 1.678-1.214 2.582-.692l.191.111c.904.521 1.213 1.678.691 2.581l-5.61 9.718z"/><path fill="#AF7E57" d="M6.183 16.007C6.663 18.35 6 21.192 6 24s2.125 12 12 12 10.5-8.234 12-10.666c1.5-2.432-.369-6.515-1.813-4.704-1.957 2.453-3.466 2.053-2.646-2.69.611-3.537-2.964-5.244-3.603-2.052-.493 2.467-1.299 1.952-1.186-.775.137-3.283-3.679-3.641-3.875.091-.142 2.707-1.049 1.551-1.322-.273-.234-1.563-4.389-2.721-4.013-.319.593 3.785-.182 4.833-1.458.723-.806-2.595-4.382-1.671-3.901.672z"/><path fill="#90603E" d="M25.965 22.053c-.3-.122-.51-.486-.599-1.114-1.892.259-4.396.77-6.366 2.695-2.556 2.499-2.992 5.2-2.971 7.007.017 1.457.812 2.147 1.045-.012.294-2.727 2.243-8.128 8.891-8.576z"/></svg>
\ No newline at end of file