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/1f455.svg b/public/emoji/1f455.svg
index 13581c7b6..1db482028 100644
--- a/public/emoji/1f455.svg
+++ b/public/emoji/1f455.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,34)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,0 -11,-2 -11,-4 0,-2 1,-7 2,-9 1,-2 8,0 9,1 1,1 2,12 0,12"/></g><g transform="translate(1,31.2832)" id="g24"><path id="path26" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.648,-0.371 -1,-0.849 -1,-1.283 0,-2 1,-7 2,-9 0.281,-0.563 1.039,-0.778 2,-0.85 C 2,-8.283 1,-4.283 0,0"/></g><g transform="translate(25,34)" id="g28"><path id="path30" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3,0 11,-2 11,-4 0,-2 -1,-7 -2,-9 -1,-2 -8,0 -9,1 -1,1 -2,12 0,12"/></g><g transform="translate(35,31.2832)" id="g32"><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.648,-0.371 1,-0.849 1,-1.283 0,-2 -1,-7 -2,-9 -0.281,-0.563 -1.039,-0.778 -2,-0.85 1,2.85 2,6.85 3,11.133"/></g><g transform="translate(25,34)" id="g36"><path id="path38" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.068,0 C -1.485,-1.695 -3.979,-3 -7,-3 c -3.021,0 -5.515,1.305 -5.932,3 L -14,0 c -2.209,0 -5,-1.791 -5,-4 0,0 0,-20 -1,-24 -1,-4 1.791,-4 4,-4 l 18,0 c 2.209,0 5,0 4,4 -1,4 -1,24 -1,24 0,2.209 -2.791,4 -5,4"/></g><g transform="translate(18,29)" id="g40"><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.866,0 7,2.239 7,5 L 5.932,5 C 5.515,3.305 3.021,2 0,2 -3.021,2 -5.515,3.305 -5.932,5 L -7,5 C -7,2.239 -3.866,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M11 2C8 2 0 4 0 6s1 7 2 9 8 0 9-1 2-12 0-12z"/><path fill="#55ACEE" d="M1 4.717C.352 5.088 0 5.565 0 6c0 2 1 7 2 9 .281.562 1.039.777 2 .85C3 13 2 9 1 4.717z"/><path fill="#3B88C3" d="M25 2c3 0 11 2 11 4s-1 7-2 9-8 0-9-1-2-12 0-12z"/><path fill="#55ACEE" d="M35 4.717c.648.371 1 .848 1 1.283 0 2-1 7-2 9-.281.562-1.039.777-2 .85C33 13 34 9 35 4.717z"/><path fill="#3B88C3" d="M25 2h-1.068C23.515 3.695 21.021 5 18 5s-5.515-1.305-5.932-3H11C8.791 2 6 3.791 6 6c0 0 0 20-1 24s1.791 4 4 4h18c2.209 0 5 0 4-4S30 6 30 6c0-2.209-2.791-4-5-4z"/><path fill="#55ACEE" d="M18 7c3.866 0 7-2.239 7-5h-1.068C23.515 3.695 21.021 5 18 5s-5.515-1.305-5.932-3H11c0 2.761 3.134 5 7 5z"/></svg>
\ No newline at end of file