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/1f330.svg b/public/emoji/1f330.svg
index 2bdaacc0c..d0e84b5eb 100644
--- a/public/emoji/1f330.svg
+++ b/public/emoji/1f330.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:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4 -8.059,-11 -18,-11 -9.941,0 -18,7 -18,11 0,19 17,25 18,25 1,0 18,-6 18,-25"/></g><g transform="translate(3.0015,6.6152)" id="g24"><path id="path26" style="fill:#a95233;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.05,0 -0.1,0.004 -0.15,0.012 -0.546,0.082 -0.922,0.591 -0.84,1.136 0.134,0.895 3.43,21.969 15.535,28.128 0.493,0.252 1.094,0.054 1.345,-0.438 0.25,-0.492 0.054,-1.094 -0.438,-1.344 C 4.266,21.802 1.019,1.06 0.987,0.852 0.913,0.355 0.486,0 0,0"/></g><g transform="translate(32.999,6.6152)" id="g28"><path id="path30" style="fill:#a95233;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.486,0 -0.913,0.355 -0.988,0.852 -0.032,0.208 -3.278,20.95 -14.465,26.642 -0.492,0.25 -0.688,0.852 -0.437,1.344 0.25,0.492 0.854,0.69 1.344,0.438 C -2.439,23.117 0.855,2.043 0.99,1.148 1.072,0.603 0.696,0.094 0.149,0.012 0.1,0.004 0.049,0 0,0"/></g><g transform="translate(12.001,3)" id="g32"><path id="path34" style="fill:#a95233;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.018,0 -0.036,0 -0.054,0.001 -0.605,0.03 -1.029,0.502 -1,1.053 -0.946,2.052 0.356,25.597 5.176,32.569 5.491,33.023 6.114,33.136 6.567,32.823 7.022,32.508 7.136,31.886 6.821,31.431 2.322,24.923 1.01,1.186 0.997,0.947 0.969,0.413 0.528,0 0,0"/></g><g transform="translate(23.999,3)" id="g36"><path id="path38" style="fill:#a95233;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.527,0 -0.969,0.413 -0.998,0.947 -0.013,0.239 -1.324,23.976 -5.824,30.484 -0.314,0.455 -0.2,1.077 0.254,1.392 0.456,0.314 1.079,0.2 1.391,-0.254 C -0.357,25.597 0.946,2.052 1,1.053 1.029,0.502 0.605,0.031 0.054,0.001 0.036,0 0.018,0 0,0"/></g><g transform="translate(36,11)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4 -8.059,-11 -18,-11 -9.941,0 -18,7 -18,11 3,-4 10,-7 18,-7 8,0 15,3 18,7"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M36 25c0 4-8.059 11-18 11S0 29 0 25C0 6 17 0 18 0s18 6 18 25z"/><g fill="#A95233"><path d="M3.001 29.385c-.05 0-.1-.004-.15-.012-.546-.082-.922-.591-.84-1.137.134-.895 3.43-21.968 15.535-28.127.493-.252 1.094-.054 1.345.438.25.492.054 1.094-.438 1.345C7.267 7.583 4.021 28.325 3.989 28.533c-.075.496-.501.852-.988.852z"/><path d="M32.999 29.385c-.486 0-.913-.355-.988-.852-.031-.208-3.277-20.95-14.464-26.642-.492-.251-.688-.853-.438-1.345.25-.492.854-.689 1.344-.438 12.107 6.16 15.401 27.234 15.536 28.128.082.546-.294 1.055-.841 1.137-.049.008-.1.012-.149.012z"/><path d="M12.001 33l-.054-.001c-.551-.029-.975-.501-.945-1.052.053-.999 1.356-24.544 6.176-31.516.314-.455.938-.567 1.391-.254.455.314.568.937.254 1.392-4.5 6.508-5.811 30.246-5.824 30.484-.029.534-.47.947-.998.947z"/><path d="M23.999 33c-.527 0-.969-.413-.998-.947-.013-.238-1.324-23.976-5.824-30.484-.314-.454-.2-1.077.254-1.392.456-.314 1.079-.2 1.391.254 4.819 6.972 6.123 30.517 6.177 31.516.029.551-.395 1.021-.946 1.052l-.054.001z"/></g><path fill="#662113" d="M36 25c0 4-8.059 11-18 11S0 29 0 25c3 4 10 7 18 7s15-3 18-7z"/></svg>
\ No newline at end of file