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/1f51e.svg b/public/emoji/1f51e.svg
index 8a7bd2017..8f877f8bb 100644
--- a/public/emoji/1f51e.svg
+++ b/public/emoji/1f51e.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.999,18.001)" id="g20"><path id="path22" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.389 -7.611,-17 -17,-17 -9.389,0 -17,7.611 -17,17 0,9.389 7.611,17 17,17 C -7.611,17 0,9.389 0,0"/></g><g transform="translate(9.521,23.7554)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.671,0 c -1.358,0 -1.924,0.991 -1.924,1.953 0,0.99 0.707,1.951 1.924,1.951 l 4.019,0 c 1.216,0 1.896,-0.876 1.896,-2.007 l 0,-16.104 c 0,-1.414 -0.906,-2.207 -2.122,-2.207 -1.217,0 -2.122,0.793 -2.122,2.207 L 0,0 Z"/></g><g transform="translate(21.7793,22.1138)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.273 0.736,-2.151 2.037,-2.151 1.302,0 2.067,0.878 2.067,2.151 0,1.217 -0.737,2.151 -2.067,2.151 C 0.707,2.151 0,1.217 0,0 m -0.538,-8.206 c 0,-1.443 0.849,-2.832 2.575,-2.832 1.612,0 2.576,1.389 2.576,2.832 0,1.784 -1.02,2.83 -2.576,2.83 -1.641,0 -2.575,-1.246 -2.575,-2.83 m -4.414,-0.283 c 0,2.264 1.245,3.934 3.027,4.895 -1.33,0.963 -2.15,2.265 -2.15,4.047 0,3.311 2.745,5.433 6.112,5.433 3.283,0 6.14,-2.093 6.14,-5.433 0,-1.584 -0.791,-3.17 -2.178,-4.047 1.924,-0.961 3.027,-2.715 3.027,-4.895 0,-3.933 -3.197,-6.451 -6.989,-6.451 -3.905,0 -6.989,2.658 -6.989,6.451"/></g><g transform="translate(2,18)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3.968 1.453,7.591 3.844,10.387 L 26.388,-12.156 C 23.591,-14.548 19.968,-16 16,-16 7.164,-16 0,-8.837 0,0 m 32,0 c 0,-3.969 -1.453,-7.592 -3.845,-10.389 L 5.612,12.155 C 8.409,14.547 12.032,16 16,16 24.837,16 32,8.836 32,0 M 16,18 C 6.059,18 -2,9.94 -2,0 c 0,-9.941 8.059,-18 18,-18 9.941,0 18,8.059 18,18 0,9.94 -8.059,18 -18,18"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M34.999 17.999c0 9.389-7.611 17-17 17s-17-7.611-17-17 7.611-17 17-17 17 7.611 17 17"/><path fill="#F5F8FA" d="M9.521 12.245H7.85c-1.358 0-1.924-.991-1.924-1.953 0-.99.707-1.952 1.924-1.952h4.019c1.217 0 1.896.876 1.896 2.007v16.104c0 1.414-.906 2.207-2.122 2.207-1.216 0-2.122-.793-2.122-2.207V12.245zm7.307 10.13c0-2.264 1.245-3.934 3.027-4.895-1.33-.963-2.15-2.265-2.15-4.047 0-3.312 2.745-5.434 6.112-5.434 3.283 0 6.14 2.093 6.14 5.434 0 1.583-.791 3.17-2.178 4.047 1.924.96 3.027 2.715 3.027 4.895 0 3.934-3.197 6.451-6.989 6.451-3.906 0-6.989-2.658-6.989-6.451zm4.413-.283c0 1.443.849 2.832 2.575 2.832 1.612 0 2.576-1.389 2.576-2.832 0-1.783-1.02-2.83-2.576-2.83-1.641 0-2.575 1.246-2.575 2.83zm.538-8.206c0 1.274.736 2.151 2.037 2.151 1.302 0 2.066-.877 2.066-2.151 0-1.217-.736-2.151-2.066-2.151-1.33 0-2.037.934-2.037 2.151z"/><path fill="#DD2E44" d="M18 0C8.059 0 0 8.06 0 18c0 9.941 8.059 18 18 18s18-8.059 18-18c0-9.94-8.059-18-18-18zm16 18c0 3.969-1.453 7.592-3.845 10.389L7.612 5.845C10.409 3.453 14.032 2 18 2c8.837 0 16 7.164 16 16zM2 18c0-3.968 1.453-7.591 3.844-10.387l22.543 22.543C25.591 32.548 21.968 34 18 34 9.164 34 2 26.837 2 18z"/></svg>
\ No newline at end of file