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/1f382.svg b/public/emoji/1f382.svg
index 955152aad..35f9a002a 100644
--- a/public/emoji/1f382.svg
+++ b/public/emoji/1f382.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(36,11)" id="g20"><path id="path22" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(36,13)" id="g24"><path id="path26" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(32.7998,14)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.54 -6.626,-8.223 -14.8,-8.223 -8.174,0 -14.8,3.683 -14.8,8.223 0,4.54 6.626,8.222 14.8,8.222 C -6.626,8.222 0,4.54 0,0"/></g><g transform="translate(29,14)" id="g32"><path id="path34" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.068 -4.926,-5.556 -11,-5.556 -6.075,0 -11,2.488 -11,5.556 0,3.068 4.925,5.556 11,5.556 C -4.926,5.556 0,3.068 0,0"/></g><g transform="translate(31.4033,13.957)" id="g36"><path id="path38" style="fill:#ad5540;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.891 -6.001,-7.044 -13.403,-7.044 -7.403,0 -13.404,3.153 -13.404,7.044 0,3.889 6.001,7.043 13.404,7.043 C -6.001,7.043 0,3.889 0,0"/></g><g transform="translate(31,15)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-9 -26,-9 -26,0 L -26,8 0,8 0,0 Z"/></g><g transform="translate(31.4033,23.9565)" id="g44"><path id="path46" style="fill:#ad5540;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.89 -6.001,-7.043 -13.403,-7.043 -7.403,0 -13.404,3.153 -13.404,7.043 0,3.89 6.001,7.044 13.404,7.044 C -6.001,7.044 0,3.89 0,0"/></g><g transform="translate(11,23)" id="g48"><path id="path50" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,7 C -1,8.552 -0.552,9 0,9 0.552,9 1,8.552 1,8 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(18,20)" id="g52"><path id="path54" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,7 C -1,8.552 -0.552,9 0,9 0.552,9 1,8.552 1,8 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(25,23)" id="g56"><path id="path58" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,7 C -1,8.552 -0.553,9 0,9 0.553,9 1,8.552 1,8 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(25,29.5)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.061,0 -1.896,0.486 -2.233,1.299 -0.292,0.706 -0.438,2.238 1.879,4.555 0.196,0.195 0.512,0.195 0.708,0 C 2.671,3.537 2.525,2.005 2.233,1.299 1.896,0.486 1.062,0 0,0"/></g><g transform="translate(18,26.5)" id="g64"><path id="path66" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.061,0 -1.896,0.486 -2.233,1.299 -0.293,0.706 -0.437,2.238 1.879,4.555 0.196,0.195 0.512,0.195 0.708,0 C 2.671,3.537 2.525,2.005 2.233,1.299 1.896,0.486 1.062,0 0,0"/></g><g transform="translate(11,29.5)" id="g68"><path id="path70" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.062,0 -1.896,0.486 -2.233,1.299 -0.293,0.706 -0.437,2.238 1.879,4.555 0.196,0.195 0.512,0.195 0.708,0 C 2.67,3.537 2.526,2.005 2.233,1.299 1.896,0.486 1.061,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#8899A6" cx="18" cy="26" rx="18" ry="10"/><ellipse fill="#CCD6DD" cx="18" cy="24.25" rx="18" ry="10"/><path fill="#DD2E44" d="M32.675 23.685c0 4.26-6.57 7.712-14.675 7.712S3.325 27.945 3.325 23.685c0-4.258 6.57-7.711 14.675-7.711 8.104 0 14.675 3.453 14.675 7.711z"/><path fill="#F4ABBA" d="M32.233 22.543c0 9.854-28.466 9.854-28.466 0v-8.759h28.466v8.759z"/><path fill="#DD2E44" d="M17.984 18.166c-8.984 0-14.218-4.132-14.218-4.132s-.016.924-.016 1.685c0 0 .032 4.898 2.572 4.898 2.459 0 2.28 2.348 3.834 2.591 1.541.241 1.712-.938 3.625-.938s2.25 2.106 4.203 2.106c2.289 0 2.477-2.106 4.389-2.106s2.132 1.224 3.386.885c1.507-.408.814-2.537 3.887-2.537 2.54 0 2.603-4.648 2.603-4.648 0-.76-.017-1.935-.017-1.935s-5.263 4.131-14.248 4.131z"/><path fill="#EA596E" d="M32.675 12.737c0 4.259-6.57 7.712-14.675 7.712S3.325 16.996 3.325 12.737 9.895 5.025 18 5.025c8.104 0 14.675 3.453 14.675 7.712z"/><path fill="#FFF8E8" d="M25.664 13.784c-.605 0-1.095-.49-1.095-1.095V5.025c0-.605.49-1.095 1.095-1.095s1.095.49 1.095 1.095v7.664c0 .605-.49 1.095-1.095 1.095z"/><path fill="#FAAA35" d="M25.664 6.667c-1.162 0-2.076-.532-2.445-1.423-.32-.773-.479-2.45 2.058-4.986.214-.214.56-.214.774 0 2.537 2.537 2.378 4.213 2.058 4.986-.369.891-1.283 1.423-2.445 1.423z"/><path fill="#FFF8E8" d="M18 17.068c-.605 0-1.095-.49-1.095-1.095V8.31c0-.605.49-1.095 1.095-1.095s1.095.49 1.095 1.095v7.664c0 .604-.49 1.094-1.095 1.094z"/><path fill="#FAAA35" d="M18 9.952c-1.162 0-2.076-.532-2.445-1.423-.321-.773-.479-2.45 2.058-4.986.214-.214.56-.214.774 0 2.537 2.537 2.378 4.213 2.058 4.986-.369.891-1.283 1.423-2.445 1.423z"/><path fill="#FFF8E8" d="M10.336 13.784c-.605 0-1.095-.49-1.095-1.095V5.025c0-.605.49-1.095 1.095-1.095s1.095.49 1.095 1.095v7.664c0 .605-.49 1.095-1.095 1.095z"/><path fill="#FAAA35" d="M10.336 6.667c-1.162 0-2.076-.532-2.445-1.423-.321-.773-.479-2.45 2.058-4.986.214-.214.56-.214.774 0 2.537 2.537 2.378 4.213 2.058 4.986-.369.891-1.283 1.423-2.445 1.423z"/></svg>
\ No newline at end of file