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/1f683.svg b/public/emoji/1f683.svg
index 30f3c027b..775ae86f8 100644
--- a/public/emoji/1f683.svg
+++ b/public/emoji/1f683.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 36,0 36,2 0,2 0,0 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(8,4)" id="g22"><path id="path24" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.344,3 -3,3 -1.657,0 -3,-1.343 -3,-3 0,-1.657 1.343,-3 3,-3 1.656,0 3,1.343 3,3"/></g><g transform="translate(7,4)" id="g26"><path id="path28" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.104,0 2,0.895 2,2"/></g><g transform="translate(16,4)" id="g30"><path id="path32" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.344,3 -3,3 -1.657,0 -3,-1.343 -3,-3 0,-1.657 1.343,-3 3,-3 1.656,0 3,1.343 3,3"/></g><g transform="translate(15,4)" id="g34"><path id="path36" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.104,0 2,0.895 2,2"/></g><g transform="translate(35,4)" id="g38"><path id="path40" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.344,3 -3,3 -1.657,0 -3,-1.343 -3,-3 0,-1.657 1.343,-3 3,-3 1.656,0 3,1.343 3,3"/></g><g transform="translate(34,4)" id="g42"><path id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.104,0 2,0.895 2,2"/></g><g transform="translate(27,4)" id="g46"><path id="path48" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.344,3 -3,3 -1.657,0 -3,-1.343 -3,-3 0,-1.657 1.343,-3 3,-3 1.656,0 3,1.343 3,3"/></g><g transform="translate(26,4)" id="g50"><path id="path52" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.104,0 2,0.895 2,2"/></g><path id="path54" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,8 0,8 0,4 36,4 36,8 Z"/><path id="path56" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,8 36,8 36,20 0,20 0,8 Z"/><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,8 0,8 0,10 36,10 36,8 Z"/><g transform="translate(5,14)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.552,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.448,1 1,1 l 2,0 C -0.447,3 0,2.553 0,2 L 0,0 Z"/></g><g transform="translate(11,14)" id="g64"><path id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.552,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.448,1 1,1 l 2,0 C -0.447,3 0,2.553 0,2 L 0,0 Z"/></g><g transform="translate(17,14)" id="g68"><path id="path70" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 l 2,0 C -0.447,3 0,2.553 0,2 L 0,0 Z"/></g><g transform="translate(23,14)" id="g72"><path id="path74" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 l 2,0 C -0.447,3 0,2.553 0,2 L 0,0 Z"/></g><g transform="translate(29,14)" id="g76"><path id="path78" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 l 2,0 C -0.447,3 0,2.553 0,2 L 0,0 Z"/></g><g transform="translate(35,14)" id="g80"><path id="path82" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 l 2,0 C -0.447,3 0,2.553 0,2 L 0,0 Z"/></g><g transform="translate(32.5547,22)" id="g84"><path id="path86" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -29.109,0 c -1.477,0 -2.752,-0.81 -3.446,-2 l 36,0 C 2.752,-0.81 1.477,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#939598" d="M0 34h36v2H0z"/><path fill="#58595B" d="M8 32c0-1.657-1.344-3-3-3s-3 1.343-3 3 1.343 3 3 3 3-1.343 3-3z"/><path fill="#292F33" d="M7 32c0-1.105-.896-2-2-2s-2 .895-2 2 .896 2 2 2 2-.895 2-2z"/><path fill="#58595B" d="M16 32c0-1.657-1.344-3-3-3s-3 1.343-3 3 1.343 3 3 3 3-1.343 3-3z"/><path fill="#292F33" d="M15 32c0-1.105-.896-2-2-2s-2 .895-2 2 .896 2 2 2 2-.895 2-2z"/><circle fill="#58595B" cx="32" cy="32" r="3"/><circle fill="#292F33" cx="32" cy="32" r="2"/><circle fill="#58595B" cx="24" cy="32" r="3"/><circle fill="#292F33" cx="24" cy="32" r="2"/><path fill="#5C913B" d="M0 28h36v4H0z"/><path fill="#FFE8B6" d="M0 16h36v12H0z"/><path fill="#FFAC33" d="M0 26h36v2H0z"/><path fill="#77B255" d="M32.555 14H3.445C1.969 14 .693 14.81 0 16h36c-.693-1.19-1.969-2-3.445-2z"/><path d="M5 22c0 .553-.447 1-1 1H2c-.552 0-1-.447-1-1v-2c0-.553.448-1 1-1h2c.553 0 1 .447 1 1v2zm6 0c0 .553-.447 1-1 1H8c-.552 0-1-.447-1-1v-2c0-.553.448-1 1-1h2c.553 0 1 .447 1 1v2zm6 0c0 .553-.447 1-1 1h-2c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1h2c.553 0 1 .447 1 1v2zm6 0c0 .553-.447 1-1 1h-2c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1h2c.553 0 1 .447 1 1v2zm6 0c0 .553-.447 1-1 1h-2c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1h2c.553 0 1 .447 1 1v2zm6 0c0 .553-.447 1-1 1h-2c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1h2c.553 0 1 .447 1 1v2z" fill="#55ACEE"/></svg>
\ No newline at end of file