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/1f50a.svg b/public/emoji/1f50a.svg
index 8614d3e92..de54654e9 100644
--- a/public/emoji/1f50a.svg
+++ b/public/emoji/1f50a.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(2,26)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,0 -2,-2 l 0,-12 c 0,-2 2,-2 2,-2 l 6,0 8,-8 c 0,0 1,-1 2,-1 l 1,0 c 0,0 1,0 1,1 l 0,32 c 0,0 0,1 -1,1 L 16,9 C 15,9 14,8 14,8 L 6,0 0,0 Z"/></g><g transform="translate(8,10)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 8,-8 c 0,0 1,-1 2,-1 l 1,0 c 0,0 1,0 1,1 l 0,32 c 0,0 0,1 -1,1 l -1,0 C 9,25 8,24 8,24 L 0,16 0,0 Z"/></g><g transform="translate(29,3.9814)" id="g28"><path id="path30" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.267,0 -0.533,0.113 -0.72,0.332 -0.339,0.398 -0.292,0.995 0.106,1.334 3.602,3.071 5.668,7.551 5.668,12.29 0,4.739 -2.067,9.219 -5.669,12.29 -0.398,0.339 -0.445,0.936 -0.106,1.334 0.339,0.399 0.936,0.444 1.334,0.106 C 4.638,24.255 6.946,19.251 6.946,13.956 6.946,8.662 4.638,3.657 0.614,0.227 0.436,0.074 0.218,0 0,0"/></g><g transform="translate(26.2695,7.041)" id="g32"><path id="path34" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.268,0 -0.533,0.115 -0.717,0.338 -0.327,0.395 -0.27,0.98 0.125,1.307 2.792,2.303 4.394,5.699 4.394,9.314 0,3.573 -1.572,6.943 -4.311,9.245 -0.392,0.33 -0.443,0.916 -0.113,1.308 0.33,0.394 0.915,0.444 1.309,0.114 C 3.847,18.97 5.659,15.083 5.659,10.959 5.659,6.787 3.812,2.87 0.59,0.213 0.417,0.069 0.208,0 0,0"/></g><g transform="translate(23.709,10.041)" id="g36"><path id="path38" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.289,0 -0.576,0.124 -0.773,0.365 -0.351,0.427 -0.289,1.057 0.137,1.408 1.861,1.528 2.927,3.783 2.927,6.186 0,2.435 -1.089,4.708 -2.988,6.236 -0.431,0.347 -0.498,0.976 -0.153,1.406 0.348,0.429 0.977,0.499 1.407,0.152 C 2.93,13.843 4.291,11.002 4.291,7.959 4.291,4.955 2.958,2.137 0.634,0.228 0.448,0.074 0.223,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M2 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H2z"/><path fill="#CCD6DD" d="M8 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z"/><path fill="#8899A6" d="M29 32.019c-.267 0-.533-.113-.72-.332-.339-.398-.292-.995.105-1.334 3.603-3.071 5.668-7.551 5.668-12.29s-2.066-9.219-5.669-12.29c-.397-.339-.444-.937-.105-1.334.339-.399.935-.444 1.334-.106 4.024 3.431 6.333 8.436 6.333 13.73 0 5.294-2.309 10.299-6.332 13.729-.179.152-.396.227-.614.227z"/><path fill="#8899A6" d="M26.27 28.959c-.269 0-.533-.115-.717-.338-.327-.396-.271-.98.125-1.307 2.792-2.304 4.394-5.699 4.394-9.315 0-3.573-1.571-6.943-4.311-9.245-.392-.33-.443-.916-.113-1.308.33-.394.915-.443 1.309-.114 3.16 2.656 4.973 6.543 4.973 10.667 0 4.172-1.848 8.089-5.069 10.746-.174.145-.383.214-.591.214z"/><path fill="#8899A6" d="M23.709 25.959c-.289 0-.576-.124-.774-.365-.351-.427-.289-1.057.138-1.407C24.934 22.658 26 20.403 26 18c0-2.435-1.089-4.708-2.988-6.236-.431-.346-.498-.976-.152-1.406.348-.429.976-.499 1.406-.152C26.639 12.116 28 14.957 28 18c0 3.004-1.333 5.822-3.657 7.731-.186.154-.411.228-.634.228z"/></svg>
\ No newline at end of file