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/1f3f9.svg b/public/emoji/1f3f9.svg
index bc367fc4e..37922127e 100644
--- a/public/emoji/1f3f9.svg
+++ b/public/emoji/1f3f9.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(21.2793,31.7202)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -8.999,0 -10.5,-1.5 -13,-4 -2.5,-2.5 -4,-4 -4,-13 0,-11.18 -2,-14 -1,-14 1,0 3,2 3,4 0,2 -1.999,13 5.001,20 L -10,-7 c 7,7 18,5 20,5 2,0 4,2 4,3 C 14,2 11.181,0 0,0"/></g><g transform="translate(29.5,6.2207)" id="g24"><path id="path26" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 l -25.22,0 c -0.277,0 -0.5,0.224 -0.5,0.5 0,0.276 0.223,0.5 0.5,0.5 l 25.22,0 C -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(29.7793,6.5)" id="g28"><path id="path30" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.277,0 -0.5,0.225 -0.5,0.5 l 0,25.221 c 0,0.277 0.223,0.5 0.5,0.5 0.275,0 0.5,-0.224 0.5,-0.5 L 0.5,0.5 C 0.5,0.225 0.275,0 0,0"/></g><g transform="translate(0,36)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.793,-8.52 4.93,-4.955 8.45,-2.863 0,0 Z"/></g><g transform="translate(26.0869,8.6074)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.364,-1.896 0,-3.564 -0.812,-3.719 -0.814,-0.156 -1.77,1.256 -2.133,3.155 C -3.31,1.334 -2.946,3 -2.133,3.156 -1.319,3.313 -0.364,1.898 0,0"/></g><g transform="translate(26.5684,7.5352)" id="g40"><path id="path42" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.365,-1.898 0,-3.564 -0.812,-3.721 -1.626,-3.877 -2.581,-2.463 -2.944,-0.566 -3.31,1.334 -2.945,3 -2.133,3.154 -1.319,3.311 -0.363,1.898 0,0"/></g><g transform="translate(27.958,6.1465)" id="g44"><path id="path46" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.364,-1.898 0,-3.564 -0.812,-3.721 -0.814,-0.156 -1.77,1.256 -2.133,3.155 -0.365,1.898 0,3.564 0.812,3.72 C -1.319,3.311 -0.363,1.898 0,0"/></g><g transform="translate(29.3721,4.7324)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.365,-1.898 0,-3.566 -0.812,-3.721 -0.814,-0.156 -1.77,1.256 -2.133,3.155 -0.365,1.898 0,3.564 0.812,3.72 C -1.319,3.311 -0.363,1.896 0,0"/></g><g transform="translate(27.3926,9.9131)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.897,-0.364 3.564,0 3.719,0.812 3.875,1.626 2.463,2.582 0.564,2.945 -1.334,3.31 -3,2.946 -3.156,2.133 -3.313,1.319 -1.898,0.364 0,0"/></g><g transform="translate(28.4648,9.4316)" id="g56"><path id="path58" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.898,-0.365 3.564,0 3.721,0.812 3.877,1.626 2.463,2.581 0.566,2.944 -1.334,3.31 -3,2.945 -3.154,2.133 -3.311,1.319 -1.898,0.363 0,0"/></g><g transform="translate(29.8535,8.042)" id="g60"><path id="path62" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.898,-0.364 3.564,0 3.721,0.812 3.877,1.626 2.465,2.582 0.566,2.945 -1.332,3.31 -2.998,2.945 -3.154,2.133 -3.311,1.319 -1.898,0.363 0,0"/></g><g transform="translate(31.2676,6.6279)" id="g64"><path id="path66" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.898,-0.365 3.566,0 3.721,0.812 3.877,1.626 2.465,2.582 0.566,2.945 -1.332,3.31 -2.998,2.945 -3.154,2.133 -3.311,1.319 -1.896,0.363 0,0"/></g><g transform="translate(30.3848,7)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.382,-0.382 0.382,-1.002 0,-1.385 -0.383,-0.382 -1.003,-0.382 -1.385,0 L -26.249,23.48 c -0.382,0.382 -0.381,1.002 0,1.384 0.382,0.382 1.002,0.382 1.384,0 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M21.279 4.28c-9 0-10.5 1.5-13 4s-4 4-4 13c0 11.181-2 14-1 14s3-2 3-4-2-13 5-20h-.001c7-6.999 18-5 20-5s4-2 4-3-2.818 1-13.999 1z"/><path fill="#D99E82" d="M29.5 29.779c0 .276-.224.5-.5.5H3.78c-.276 0-.5-.224-.5-.5s.224-.5.5-.5H29c.276 0 .5.224.5.5zm.279-.279c-.277 0-.5-.225-.5-.5V3.779c0-.276.223-.5.5-.5.275 0 .5.224.5.5V29c0 .275-.224.5-.5.5z"/><path fill="#99AAB5" d="M0 0l2.793 8.52L4.93 4.955l3.52-2.092z"/><path fill="#DD2E44" d="M26.087 27.393c.364 1.897 0 3.564-.812 3.719-.814.156-1.77-1.256-2.133-3.154-.364-1.898-.001-3.564.812-3.721.814-.157 1.769 1.257 2.133 3.156z"/><path fill="#F4900C" d="M26.568 28.465c.365 1.899 0 3.565-.812 3.721-.813.156-1.769-1.258-2.132-3.154-.365-1.9-.001-3.566.811-3.721.814-.157 1.77 1.255 2.133 3.154z"/><path fill="#A0041E" d="M27.958 29.854c.364 1.899 0 3.564-.812 3.721-.813.156-1.77-1.256-2.133-3.154-.364-1.898 0-3.564.812-3.721.814-.157 1.77 1.255 2.133 3.154z"/><path fill="#DD2E44" d="M29.372 31.268c.365 1.898 0 3.566-.812 3.721-.814.156-1.77-1.256-2.133-3.154-.364-1.899 0-3.564.812-3.721.814-.157 1.77 1.257 2.133 3.154zm-1.979-5.181c1.897.364 3.564 0 3.719-.812.156-.814-1.256-1.77-3.154-2.133-1.898-.364-3.564-.001-3.721.812-.157.814 1.257 1.769 3.156 2.133z"/><path fill="#F4900C" d="M28.465 26.568c1.899.365 3.565 0 3.721-.812.156-.813-1.258-1.769-3.154-2.132-1.9-.365-3.566-.001-3.721.811-.157.814 1.255 1.77 3.154 2.133z"/><path fill="#A0041E" d="M29.854 27.958c1.899.364 3.564 0 3.721-.812.156-.813-1.256-1.77-3.154-2.133-1.898-.364-3.564 0-3.721.812-.157.814 1.255 1.77 3.154 2.133z"/><path fill="#DD2E44" d="M31.268 29.372c1.898.365 3.566 0 3.721-.812.156-.814-1.256-1.77-3.154-2.133-1.899-.364-3.564 0-3.721.812-.157.814 1.257 1.77 3.154 2.133z"/><path fill="#CCD6DD" d="M30.385 29c.382.382.382 1.002 0 1.385-.383.382-1.003.382-1.385 0L4.136 5.52c-.382-.382-.382-1.002 0-1.384.382-.382 1.001-.382 1.384 0L30.385 29z"/></svg>
\ No newline at end of file