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/1f407.svg b/public/emoji/1f407.svg
index 54f4d6965..71be12240 100644
--- a/public/emoji/1f407.svg
+++ b/public/emoji/1f407.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(9,25)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4.142 -2,11 -1,11 0,11 6,7 4,0 2.862,-3.983 3.105,-4 2,-4 0.896,-4 0,-4.142 0,0"/></g><g transform="translate(9.5498,24.2964)" id="g24"><path id="path26" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3.414 -1.297,9.065 -0.648,9.065 0,9.065 3.89,5.768 2.593,0 1.855,-3.282 2.013,-3.296 1.296,-3.296 0.58,-3.296 0,-3.414 0,0"/></g><g transform="translate(4.7886,23.625)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.062,4.003 -4.755,10.119 -3.789,10.375 -2.822,10.632 4.003,8.305 3.866,1.026 3.789,-3.115 4.027,-3.07 2.959,-3.353 1.892,-3.636 1.062,-4.003 0,0"/></g><g transform="translate(5.5005,23.0859)" id="g32"><path id="path34" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.876,3.299 -3.579,8.429 -2.953,8.595 -2.326,8.762 2.279,6.573 2.506,0.665 2.635,-2.696 2.791,-2.67 2.099,-2.854 1.406,-3.037 0.876,-3.299 0,0"/></g><g transform="translate(36,7.5)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><g transform="translate(30.7334,4.2637)" id="g40"><path id="path42" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.493,1.383 2.267,3.519 2.267,6.736 0,7.18 -6.821,11 -14,11 -2.057,0 -3.829,-0.157 -5.324,-0.539 -1.085,1.13 -2.859,1.539 -5.276,1.539 -4.265,0 -8.4,-4.068 -8.4,-8.333 0,-4.13 3.88,-4.636 7.998,-4.664 10e-4,-10e-4 10e-4,-0.002 0.002,-0.003 3,-5 1,-10 3,-10 1.588,0 1.914,2.217 1.981,4.375 1.068,-0.663 2.258,-1.191 3.531,-1.577 -0.878,-0.523 -1.512,-1.068 -1.512,-1.298 0,-1.381 2,-1.5 5,-1.5 5.522,0 13,0 11,4 C 0.213,-0.156 0.115,-0.073 0,0"/></g><g transform="translate(7,18)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(2,15)" id="g48"><path id="path50" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.5,-2 -1,-2 -0.5,0 -1,0.896 -1,2 0,1.105 0.448,1 1,1 0.552,0 1,0.105 1,-1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M9 11C9 6.858 7 0 8 0s7 4 5 11c-1.138 3.983-.896 4-2 4s-2 .142-2-4z"/><path fill="#F4ABBA" d="M9.55 11.704c0-3.414-1.297-9.065-.648-9.065.648 0 4.538 3.296 3.241 9.065-.738 3.282-.581 3.296-1.297 3.296s-1.296.117-1.296-3.296z"/><path fill="#99AAB5" d="M4.789 12.375C3.726 8.372.033 2.256 1 2c.966-.257 7.792 2.07 7.655 9.349-.078 4.142.161 4.096-.907 4.379-1.068.283-1.897.65-2.959-3.353z"/><path fill="#F4ABBA" d="M5.5 12.914c-.875-3.299-3.579-8.429-2.952-8.595.627-.167 5.232 2.022 5.458 7.93.129 3.361.285 3.335-.407 3.519-.692.183-1.223.445-2.099-2.854z"/><circle fill="#CCD6DD" cx="32.5" cy="28.5" r="3.5"/><path fill="#99AAB5" d="M30.733 31.736C32.227 30.354 33 28.218 33 25c0-7.18-6.82-11-14-11-2.057 0-3.829.157-5.323.54C12.592 13.41 10.817 13 8.4 13 4.136 13 0 17.069 0 21.333c0 4.13 3.88 4.637 7.999 4.664L8 26c3 5 1 10 3 10 1.588 0 1.914-2.217 1.981-4.375 1.068.663 2.258 1.191 3.531 1.577C15.635 33.726 15 34.271 15 34.5c0 1.381 2 1.5 5 1.5 5.522 0 13 0 11-4-.054-.107-.151-.19-.267-.264z"/><circle fill="#292F33" cx="6" cy="18" r="1"/><path fill="#F4ABBA" d="M2 21c0 1.104-.5 2-1 2s-1-.896-1-2 .448-1 1-1 1-.104 1 1z"/></svg>
\ No newline at end of file