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/1f696.svg b/public/emoji/1f696.svg
index da0c6c583..e066a1246 100644
--- a/public/emoji/1f696.svg
+++ b/public/emoji/1f696.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(34,3)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -3,0 c -1.104,0 -2,0.895 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 3,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(9,3)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 l -3,0 c -1.104,0 -2,0.895 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 3,0 C -0.896,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(9,31)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,1 14,1 18,0 3.881,-0.97 5,-11 5,-11 0,0 2,0 2,-4 l 0,-8 c 0,0 0.123,-4 -4,-4 l -24,0 c -4.123,0 -4,4 -4,4 l 0,8 c 0,0 0,4 2,4 0,0 1.12,10.03 5,11"/></g><g transform="translate(18,21)" id="g32"><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.905,0 8.623,-0.2 12,-0.561 L 11,5 C 10,8 4,8 0,8 -4,8 -10,8 -11,5 l -1,-5.561 C -8.623,-0.2 -3.905,0 0,0"/></g><g transform="translate(5,20.5)" id="g36"><path id="path38" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.829 -0.671,-1.5 -1.5,-1.5 l -2,0 c -0.829,0 -1.5,0.671 -1.5,1.5 0,0.829 0.671,1.5 1.5,1.5 l 2,0 C -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(31,20.5)" id="g40"><path id="path42" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.829 0.672,-1.5 1.5,-1.5 l 2,0 C 4.328,-1.5 5,-0.829 5,0 5,0.829 4.328,1.5 3.5,1.5 l -2,0 C 0.672,1.5 0,0.829 0,0"/></g><g transform="translate(11,13)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -1,0 c -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 l 1,0 C -1.343,3 0,1.657 0,0"/></g><g transform="translate(32,13)" id="g48"><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.344,-3 -3,-3 l -1,0 c -1.656,0 -3,1.343 -3,3 0,1.657 1.344,3 3,3 l 1,0 C -1.344,3 0,1.657 0,0"/></g><g transform="translate(25,14)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 c -2.456,0 -4.486,3.336 -4.868,4.004 -0.274,0.479 -0.108,1.09 0.371,1.364 0.478,0.275 1.09,0.108 1.365,-0.37 C -16.438,3.789 -14.963,2 -14,2 L 0,2 C 0.983,2 2.46,3.655 3.148,4.773 3.438,5.244 4.052,5.391 4.524,5.101 4.994,4.812 5.141,4.196 4.852,3.726 4.617,3.344 2.487,0 0,0"/></g><path id="path56" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 6,8 2,8 2,12 6,12 6,8 Z"/><path id="path58" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,8 -4,0 0,4 4,0 0,-4 z"/><g transform="translate(10,10)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 l -2,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 l 2,0 C -0.896,2 0,1.105 0,0"/></g><g transform="translate(32,10)" id="g64"><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.895,2 -2,2 l -2,0 c -1.104,0 -2,-0.895 -2,-2 0,-1.104 0.896,-2 2,-2 l 2,0 c 1.105,0 2,0.896 2,2"/></g><g transform="translate(25,10)" id="g68"><path id="path70" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -10,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 L -2,2 C -0.895,2 0,1.105 0,0"/></g><g transform="translate(22,34)" id="g72"><path id="path74" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8,0 c -1.657,0 -3,-1.343 -3,-3 L 3,-3 C 3,-1.343 1.657,0 0,0"/></g><path id="path76" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,31 -8,0 0,2 8,0 0,-2 z"/><path id="path78" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,31 -4,0 0,1 4,0 0,-1 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M34 33c0 1.104-.896 2-2 2h-3c-1.104 0-2-.896-2-2v-8c0-1.104.896-2 2-2h3c1.104 0 2 .896 2 2v8zM9 33c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2v-8c0-1.104.896-2 2-2h3c1.104 0 2 .896 2 2v8z"/><path fill="#FFCC4D" d="M9 5c4-1 14-1 18 0 3.881.97 5 11 5 11s2 0 2 4v8s.123 4-4 4H6c-4.123 0-4-4-4-4v-8s0-4 2-4C4 16 5.12 5.97 9 5z"/><path fill="#55ACEE" d="M18 15c3.905 0 8.623.2 12 .561L29 10c-1-3-7-3-11-3S8 7 7 10l-1 5.561C9.377 15.2 14.095 15 18 15z"/><path fill="#FFCC4D" d="M5 15.5c0 .829-.671 1.5-1.5 1.5h-2C.671 17 0 16.329 0 15.5S.671 14 1.5 14h2c.829 0 1.5.671 1.5 1.5zm26 0c0 .829.672 1.5 1.5 1.5h2c.828 0 1.5-.671 1.5-1.5s-.672-1.5-1.5-1.5h-2c-.828 0-1.5.671-1.5 1.5zM11 23c0 1.657-1.343 3-3 3H7c-1.657 0-3-1.343-3-3s1.343-3 3-3h1c1.657 0 3 1.343 3 3zm21 0c0 1.657-1.344 3-3 3h-1c-1.656 0-3-1.343-3-3s1.344-3 3-3h1c1.656 0 3 1.343 3 3z"/><path fill="#FFAC33" d="M25 22H11c-2.456 0-4.486-3.336-4.868-4.004-.274-.479-.107-1.089.372-1.363.478-.275 1.089-.108 1.364.37C8.562 18.211 10.037 20 11 20h14c.983 0 2.46-1.655 3.148-2.773.289-.471.903-.618 1.376-.328.47.29.616.905.327 1.376C29.617 18.656 27.487 22 25 22z"/><path fill="#F4900C" d="M2 24h4v4H2zm28 0h4v4h-4z"/><path fill="#FFF" d="M10 26c0 1.104-.896 2-2 2H6c-1.104 0-2-.896-2-2s.896-2 2-2h2c1.104 0 2 .896 2 2zm22 0c0-1.104-.896-2-2-2h-2c-1.104 0-2 .896-2 2s.896 2 2 2h2c1.104 0 2-.896 2-2z"/><path fill="#66757F" d="M25 26c0 1.104-.896 2-2 2H13c-1.104 0-2-.896-2-2s.896-2 2-2h10c1.104 0 2 .896 2 2z"/><path fill="#FFE8B6" d="M22 2h-8c-1.657 0-3 1.343-3 3h14c0-1.657-1.343-3-3-3z"/><path fill="#CCD6DD" d="M14 3h8v2h-8z"/><path fill="#99AAB5" d="M16 4h4v1h-4z"/></svg>
\ No newline at end of file