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/1f3ce.svg b/public/emoji/1f3ce.svg
index 3fc893c90..3f4271669 100644
--- a/public/emoji/1f3ce.svg
+++ b/public/emoji/1f3ce.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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 transform="translate(30,13)" id="g12"><path id="path14" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3,0 5,6 2,6 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(29,17)" id="g24"><path id="path26" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3,4 -4,4 l -9,0 -6,-5 -6.081,-1.77 c -0.62,-0.217 -1.45,-0.636 -1.56,-1.23 L -29,-14 c -0.125,-0.646 0.448,-1 1,-1 l 34,0 c 0.553,0 1,0.447 1,1 l 0,7 0,1 0,4 C 7,0 0,0 0,0"/></g><g transform="translate(16.0938,16)" id="g28"><path id="path30" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.094,-14 12,0 5,14 L 0,0 Z"/></g><g transform="translate(12,5)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(10,5)" id="g36"><path id="path38" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(33,5)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(31,5)" id="g44"><path id="path46" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(16,9.5)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.934 1.567,3.5 3.5,3.5 5.433,3.5 7,1.934 7,0 7,-1.934 5.433,-3.5 3.5,-3.5 1.567,-3.5 0,-1.934 0,0"/></g><g transform="translate(21.0547,10.7578)" id="g52"><path id="path54" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.441 -0.189,-0.826 -0.574,-1.072 0.504,-0.231 0.853,-0.699 0.853,-1.254 0,-0.84 -0.769,-1.547 -1.763,-1.547 -1.037,0 -1.682,0.764 -1.682,1.316 0,0.274 0.287,0.469 0.539,0.469 0.477,0 0.364,-0.818 1.156,-0.818 0.364,0 0.659,0.279 0.659,0.65 0,0.981 -1.192,0.26 -1.192,1.086 0,0.734 0.995,0.238 0.995,1.016 0,0.265 -0.188,0.468 -0.505,0.468 -0.665,0 -0.573,-0.685 -1.05,-0.685 -0.287,0 -0.455,0.258 -0.455,0.517 0,0.547 0.749,1.135 1.527,1.135 C -0.483,1.281 0,0.545 0,0"/></g><g transform="translate(30,18)" id="g56"><path id="path58" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,1 6,2 6,0 0,0 Z"/></g><g transform="translate(17,20)" id="g60"><path id="path62" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 8,-4 -5,-4 0,0 Z"/></g><g transform="translate(6,12)" id="g64"><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 2,0 C -0.448,1 0,0.553 0,0"/></g><g transform="translate(36,14)" id="g68"><path id="path70" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 c -0.553,0 -1,-0.447 -1,-1 l 0,-1 c 0,-0.553 0.447,-1 1,-1 l 1,0 0,3 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#414042" d="M30 23h3l2-6h-3z"/><path fill="#F4900C" d="M29 19s-3-4-4-4h-9l-6 5-6.081 1.77c-.62.217-1.45.636-1.56 1.23L0 33c-.125.646.448 1 1 1h34c.553 0 1-.447 1-1V21c0-2-7-2-7-2z"/><path fill="#3B88C3" d="M16.094 20L11 34h12l5-14z"/><circle fill="#292F33" cx="8" cy="31" r="4"/><circle fill="#58595B" cx="8" cy="31" r="2"/><circle fill="#292F33" cx="29" cy="31" r="4"/><circle fill="#58595B" cx="29" cy="31" r="2"/><circle fill="#FFF" cx="19.5" cy="26.5" r="3.5"/><path fill="#231F20" d="M21.055 25.242c0 .441-.19.826-.574 1.072.504.23.854.699.854 1.254 0 .84-.769 1.547-1.764 1.547-1.037 0-1.682-.764-1.682-1.316 0-.273.287-.469.539-.469.477 0 .364.818 1.156.818.363 0 .658-.279.658-.65 0-.98-1.191-.26-1.191-1.086 0-.734.995-.238.995-1.016 0-.266-.188-.469-.505-.469-.665 0-.574.686-1.05.686-.288 0-.456-.258-.456-.518 0-.547.75-1.135 1.527-1.135 1.009.001 1.493.737 1.493 1.282z"/><path fill="#F4900C" d="M30 18l1-1 5-1v2z"/><path fill="#88C9F9" d="M17 16h8v4H12z"/><path fill="#FFCC4D" d="M6 24c0 .553-.448 1-1 1H3c-.552 0-1-.447-1-1 0-.553.448-1 1-1h2c.552 0 1 .447 1 1z"/><path fill="#DD2E44" d="M36 22h-1c-.553 0-1 .447-1 1v1c0 .553.447 1 1 1h1v-3z"/></svg>
\ No newline at end of file