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/1f5fe.svg b/public/emoji/1f5fe.svg
index 02b5e88d6..a67c561e2 100644
--- a/public/emoji/1f5fe.svg
+++ b/public/emoji/1f5fe.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,36 C 4,36 0,36 0,32 L 0,32 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,28 c 0,0 0,4 -4,4 l 0,0 -28,0 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(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(24,34)" id="g32"><path id="path34" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,0 2,-3 3,-3 1,0 3,0 3,-1 0,-1 -3,-1 -3,-2 0,-1 -1,-1 -2,-1 -1,0 -3,0 -3,1 0,1 2,0 2,1 0,1 -1,5 0,5"/></g><g transform="translate(21,26)" id="g36"><path id="path38" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1 2,1 2,1 2,1 3,-1 2,-1 1,-1 0,0 0,0"/></g><g transform="translate(23,24)" id="g40"><path id="path42" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,0 -1,-2 -1,-3 0,-1 0,-3 -1,-3 -1,0 -2,-1 -2,-2 0,-1 -1,-2 -2,-2 -1,0 -2,-2 -2,-2 0,0 -4,-1 -5,-1 -1,0 -3,0 -3,-1 0,-1 -3,-2 -1,-2 2,0 2,1 3,1 l 2,0 c 0,0 3,1 3,0 0,-1 0,-2 1,-2 1,0 2,1 2,2 0,1 1,1 2,1 1,0 2,0 2,1 0,1 1,2 2,2 1,0 1,2 1,3 0,1 0,3 1,3 1,0 2,3 1,3 -1,0 -2,0 -2,1 0,1 -1,1 -1,1"/></g><g transform="translate(8,6)" id="g44"><path id="path46" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1 0,2 1,2 L 4,2 C 5,2 5,2 4,1 3,0 3,1 2,1 1,1 2,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(4,3)" id="g48"><path id="path50" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1 1,1 1,2 1,3 0,2 0,3 0,4 1,4 2,4 3,4 3,3 3,2 3,1 2,1 2,0 2,-1 1,-1 1,-1 1,-1 0,-1 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M36 32s0 4-4 4H4s-4 0-4-4V4c0-4 4-4 4-4h28c4 0 4 4 4 4v28z"/><g fill="#3E721D"><path d="M24 2c1 0 2 3 3 3s3 0 3 1-3 1-3 2-1 1-2 1-3 0-3-1 2 0 2-1-1-5 0-5zm-3 8c0-1 2-1 2-1s1 2 0 2-2-1-2-1zm2 2c-1 0-1 2-1 3s0 3-1 3-2 1-2 2-1 2-2 2-2 2-2 2-4 1-5 1-3 0-3 1-3 2-1 2 2-1 3-1h2s3-1 3 0 0 2 1 2 2-1 2-2 1-1 2-1 2 0 2-1 1-2 2-2 1-2 1-3 0-3 1-3 2-3 1-3-2 0-2-1-1-1-1-1z"/><path d="M8 30c0-1 0-2 1-2h3c1 0 1 0 0 1s-1 0-2 0 0 2-1 2-1-1-1-1zm-4 3c0-1 1-1 1-2s-1 0-1-1 1-1 2-1 1 1 1 2-1 1-1 2-1 1-1 1-1 0-1-1z"/></g></svg>
\ No newline at end of file