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/1f3b7.svg b/public/emoji/1f3b7.svg
index 146331c50..ed0f849e0 100644
--- a/public/emoji/1f3b7.svg
+++ b/public/emoji/1f3b7.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(14,20)" id="g20"><path id="path22" style="fill:#fcab40;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 0,0 -5,-10 c 0,0 -1,-2 1,-2 1,0 2,2 2,2 L 12,9 c 0,0 2,4 8,1 L 20,8 C 17,9 16,7 16,7 L 1,-17 c 0,0 -2,-3 -7,-3 -6,0 -7,5 -7,8 0,2 1,4 2,6 1,2 -2,6 -2,6 L 0,0 Z"/></g><g transform="translate(7.5,16)" id="g24"><path id="path26" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.46,0 -7.5,1.048 -7.5,4 -7.5,6.953 -3.46,8 0,8 3.46,8 7.5,6.953 7.5,4 7.5,1.048 3.46,0 0,0"/></g><g transform="translate(21,19)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(24,23)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(27,27)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(33.998,25.9995)" id="g40"><path id="path42" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.3,0 -0.605,0.068 -0.893,0.211 l -2,1 c -0.988,0.495 -1.388,1.696 -0.894,2.684 0.493,0.986 1.693,1.39 2.683,0.895 l 2,-1 C 1.885,3.295 2.285,2.094 1.791,1.106 1.441,0.405 0.734,0 0,0"/></g><g transform="translate(16.2651,10.7754)" id="g44"><path id="path46" style="fill:#fcab40;fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 0,0 -1.268,-1.548 -7.458,3.52 -6.192,5.067 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill-rule="evenodd" clip-rule="evenodd" fill="#FCAB40" d="M14 16L9 26s-1 2 1 2c1 0 2-2 2-2L26 7s2-4 8-1v2c-3-1-4 1-4 1L15 33s-2 3-7 3c-6 0-7-5-7-8 0-2 1-4 2-6s-2-6-2-6h13z"/><path fill="#FDCB58" d="M7.5 20C4.04 20 0 18.952 0 16c0-2.953 4.04-4 7.5-4s7.5 1.047 7.5 4c0 2.952-4.04 4-7.5 4z"/><circle fill="#CCD6DD" cx="19" cy="17" r="2"/><circle fill="#CCD6DD" cx="22" cy="13" r="2"/><circle fill="#CCD6DD" cx="25" cy="9" r="2"/><path fill="#9AAAB4" d="M33.998 10c-.3 0-.605-.068-.893-.211l-2-1c-.988-.494-1.389-1.695-.895-2.684.493-.986 1.693-1.39 2.684-.895l2 1c.988.494 1.389 1.695.895 2.684-.351.701-1.057 1.106-1.791 1.106z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#FCAB40" d="M8.806 21.703l1.267-1.547 6.19 5.069-1.267 1.547z"/></svg>
\ No newline at end of file