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/1f5d1.svg b/public/emoji/1f5d1.svg
index d9ea71a06..266950747 100644
--- a/public/emoji/1f5d1.svg
+++ b/public/emoji/1f5d1.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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 transform="translate(28.8918,9.1921)" id="g12"><path id="path14" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.725,4.39 0.824,11.05 1.235,9.975 0,0 Z m -5.392,-5.192 2.216,5.79 2.216,-5.79 -4.432,0 z M -9.44,4.39 -7.034,10.678 -4.627,4.39 -7.034,-1.736 -9.44,4.39 Z m -3.668,-9.582 2.216,5.79 2.216,-5.79 -4.432,0 z m -4.048,9.582 2.406,6.288 2.407,-6.288 -2.407,-6.126 -2.406,6.126 z m -3.667,-9.582 2.215,5.79 2.216,-5.79 -4.431,0 z m -2.111,15.389 0.326,0.853 2.549,-6.66 -1.573,-4.004 -1.302,9.811 z m 4.184,10.933 2.599,-6.791 -2.457,-6.254 -2.601,6.62 2.459,6.425 z m 7.858,-0.371 2.457,-6.42 -2.457,-6.254 -2.457,6.254 2.457,6.42 z m 7.858,0.371 2.459,-6.425 -2.601,-6.62 -2.457,6.254 2.599,6.791 z m 5.642,1.678 -1.784,-4.542 -1.784,4.542 -4.148,0 -1.926,-4.903 -1.926,4.903 -3.863,0 -1.927,-4.903 -1.926,4.903 -4.147,0 -1.785,-4.542 -1.784,4.542 -2.366,0 3.735,-28.013 24.263,0 3.735,28.013 -2.367,0 z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(32,2)" id="g24"><path id="path26" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.104 -0.895,2 -2,2 l -24,0 c -1.104,0 -2,-0.896 -2,-2 0,-1.104 0.896,-2 2,-2 l 24,0 c 1.105,0 2,0.896 2,2"/></g><g transform="translate(36,34)" id="g28"><path id="path30" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.895,2 -2,2 l -32,0 c -1.104,0 -2,-0.895 -2,-2 0,-1.104 0.896,-2 2,-2 l 32,0 c 1.105,0 2,0.896 2,2"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M31.5 4l-1.784 4.542L27.932 4h-4.147l-1.926 4.903L19.932 4h-3.863l-1.926 4.903L12.216 4H8.068L6.284 8.542 4.5 4H2.133l3.735 28.013h24.263L33.867 4H31.5zm-5.642 1.678l2.459 6.425-2.601 6.621-2.457-6.254 2.599-6.792zM18 6.049l2.457 6.42L18 18.723l-2.457-6.254L18 6.049zm-7.858-.371l2.599 6.792-2.457 6.254-2.601-6.621 2.459-6.425zM5.958 16.611l.326-.853 2.549 6.66-1.573 4.004-1.302-9.811zM8.068 32l2.216-5.79L12.5 32H8.068zm3.668-9.582l2.407-6.288 2.406 6.288-2.406 6.126-2.407-6.126zM15.784 32L18 26.21 20.216 32h-4.432zm3.667-9.582l2.406-6.288 2.406 6.288-2.406 6.126-2.406-6.126zM23.5 32l2.216-5.79L27.932 32H23.5zm5.392-5.192l-1.725-4.39 2.549-6.659.411 1.074-1.235 9.975z"/><path fill="#67757F" d="M32 34c0-1.104-.896-2-2-2H6c-1.104 0-2 .896-2 2s.896 2 2 2h24c1.104 0 2-.896 2-2zm4-32c0-1.105-.896-2-2-2H2C.896 0 0 .896 0 2c0 1.105.896 2 2 2h32c1.104 0 2-.895 2-2z"/></svg>
\ No newline at end of file