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/1f1f8-1f1e7.svg b/public/emoji/1f1f8-1f1e7.svg
index f5629076f..a55ff606a 100644
--- a/public/emoji/1f1f8-1f1e7.svg
+++ b/public/emoji/1f1f8-1f1e7.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,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(13.5886,18.7051)" id="g20"><path id="path22" style="fill:#0051ba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.308,0.95 -2.616,0 l 0.5,1.538 -1.309,0.95 1.617,0 0.5,1.538 0.5,-1.538 1.616,0 L -0.5,1.538 0,0 Z m -4.393,3.766 -1.308,0.95 -1.308,-0.95 0.499,1.537 -1.308,0.951 1.617,0 0.5,1.537 0.499,-1.537 1.617,0 -1.308,-0.951 0.5,-1.537 z m -4.893,5.303 0.5,-1.538 -1.308,0.95 -1.309,-0.95 0.5,1.538 -1.308,0.95 1.617,0 0.5,1.538 0.499,-1.538 1.617,0 -1.308,-0.95 z M -8.786,0 -10.094,0.95 -11.403,0 l 0.5,1.538 -1.308,0.95 1.617,0 0.5,1.538 0.499,-1.538 1.617,0 -1.308,-0.95 0.5,-1.538 z m 6.978,10.019 0.5,1.538 0.5,-1.538 1.616,0 L -0.5,9.069 0,7.531 l -1.308,0.95 -1.308,-0.95 0.5,1.538 -1.309,0.95 1.617,0 z m -11.781,2.276 0,-24.655 33.983,24.655 -33.983,0 z"/></g><g transform="translate(36,5)" id="g24"><path id="path26" style="fill:#215b33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,24.655 -33.983,0 0,0 Z"/></g><g transform="translate(33.9828,31)" id="g28"><path id="path30" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -33.983,-24.655 0,-1.345 2.018,0 33.982,24.655 0,1.345 0,0 L 0,0 Z"/></g><g transform="translate(8.387,24.9226)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.5,1.538 -0.999,0 l -1.617,0 1.308,-0.95 -0.5,-1.538 1.308,0.95 1.308,-0.95 L 0.309,-0.95 1.617,0 0,0 Z"/></g><g transform="translate(3.4941,30.2258)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,-1.538 -1.617,0 1.309,-0.95 -0.5,-1.538 1.308,0.95 1.308,-0.95 -0.5,1.538 1.308,0.95 -1.616,0 L 0,0 Z"/></g><g transform="translate(12.7803,21.1571)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.5,1.538 -0.999,0 l -1.617,0 1.308,-0.95 -0.5,-1.538 1.308,0.95 1.308,-0.95 L 0.309,-0.95 1.617,0 0,0 Z"/></g><g transform="translate(3.9937,21.1571)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.5,1.538 -0.999,0 l -1.617,0 1.308,-0.95 -0.5,-1.538 1.308,0.95 1.308,-0.95 L 0.309,-0.95 1.617,0 0,0 Z"/></g><g transform="translate(10.9725,26.2)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.308,0.95 2.616,0 2.117,1.538 l 1.308,0.95 -1.617,0 -0.5,1.538 -0.5,-1.538 -1.616,0 L 0.5,1.538 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#0051BA" d="M33.552 5.312C33.075 5.111 32.55 5 32 5H4C1.791 5 0 6.791 0 9v18c0 .806.239 1.556.649 2.184L33.552 5.312z"/><path fill="#215B33" d="M2.448 30.687l.006.003c.476.2.998.31 1.546.31h28c2.209 0 4-1.791 4-4V9c0-.806-.238-1.556-.649-2.184L2.448 30.687z"/><path fill="#FCD116" d="M.651 29.189c.434.662 1.059 1.188 1.797 1.499L35.351 6.816l-.001-.002c-.434-.663-1.059-1.19-1.798-1.501L.649 29.184l.002.005z"/><g fill="#FFF"><path d="M7.069 12.021l.01.007-.484 1.49 1.292-.939 1.293.939-.484-1.49.009-.007-.009-.029 1.258-.915H8.387l-.5-1.537-.499 1.537H5.82l1.259.915z"/><path d="M8.705 12.021l1.299-.944h-.05l-1.258.915zm-1.636 0l.01-.029-1.259-.915h-.049zm-.474 1.497l-.016.048 1.308-.951 1.308.951-.015-.048-1.293-.939zM2.676 8.255l.01.007-.485 1.491 1.293-.939 1.293.939-.485-1.491.01-.007-.01-.029 1.259-.914H3.994l-.5-1.538-.5 1.538H1.427l1.259.914z"/><path d="M2.201 9.753l-.015.047 1.308-.95 1.308.95-.015-.047-1.293-.939zm.475-1.498l.01-.029-1.259-.914h-.049zm1.636 0l1.299-.943h-.05l-1.259.914zm7.151 7.531l.009.007-.484 1.491 1.293-.94 1.292.94-.484-1.491.01-.007-.01-.029 1.258-.914H12.78l-.499-1.538-.5 1.538h-1.567l1.258.914z"/><path d="M13.099 15.786l1.298-.943h-.05l-1.258.914zm-1.636 0l.009-.029-1.258-.914h-.05zm-.475 1.498l-.015.047 1.308-.95 1.308.95-.016-.047-1.292-.94zm-8.312-1.498l.01.007-.485 1.491 1.293-.94 1.293.94-.485-1.491.01-.007-.01-.029 1.259-.914H3.994l-.5-1.538-.5 1.538H1.427l1.259.914z"/><path d="M4.312 15.786l1.299-.943h-.05l-1.259.914zm-2.111 1.498l-.015.047 1.308-.95 1.308.95-.015-.047-1.293-.94zm.475-1.498l.01-.029-1.259-.914h-.049zm8.787-7.531l.009.007-.484 1.491 1.293-.939 1.292.939-.484-1.491.01-.007-.01-.029 1.258-.914H12.78l-.499-1.538-.5 1.538h-1.567l1.258.914z"/><path d="M11.463 8.255l.009-.029-1.258-.914h-.05zm1.636 0l1.298-.943h-.05l-1.258.914zm-2.111 1.498l-.015.047 1.308-.95 1.308.95-.016-.047-1.292-.939z"/></g></svg>
\ No newline at end of file