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/1f5e3.svg b/public/emoji/1f5e3.svg
index ded1caa61..5607d68c0 100644
--- a/public/emoji/1f5e3.svg
+++ b/public/emoji/1f5e3.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(35.8379,12.8408)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.003,-0.553 -0.443,-1.002 -0.998,-1.003 l -5,-0.013 c -0.552,-0.002 -0.999,0.447 -1,0.997 -0.003,0.555 0.444,1.002 0.995,1.004 l 5,0.013 C -0.45,0.998 -0.001,0.553 0,0"/></g><g transform="translate(34.251,18.3301)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.238,-0.499 0.025,-1.095 -0.475,-1.333 l -4.516,-2.145 c -0.498,-0.236 -1.094,-0.023 -1.33,0.476 -0.24,0.498 -0.026,1.094 0.473,1.333 l 4.516,2.144 C -0.832,0.711 -0.237,0.499 0,0"/></g><g transform="translate(34.2783,7.3428)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.234,0.501 0.02,1.096 -0.48,1.33 L -5.008,3.452 C -5.509,3.688 -6.103,3.473 -6.338,2.973 -6.572,2.472 -6.357,1.877 -5.856,1.643 L -1.33,-0.48 C -0.83,-0.715 -0.233,-0.5 0,0"/></g><g transform="translate(27.9795,21.125)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.42,0.419 -2.693,1.547 -3.136,2.25 -0.76,1.208 0.156,1.521 -0.154,4.889 -0.284,3.083 -4.529,6.399 -9.69,6.736 -2.345,0.153 -4.785,-0.326 -7.285,-1.693 -6.42,-3.511 -8.965,-10.932 -4.006,-18.099 4.47,-6.46 0.276,-9.379 0.276,-9.379 0,0 0.166,-1.36 2.914,-3.188 2.749,-1.828 6.121,-0.588 6.121,-0.588 0,0 1.112,3.954 4.748,3.59 2.607,-0.384 6.266,0.128 7.191,1.024 0.866,0.837 -0.151,1.886 0.539,4.224 -2.365,0.231 -3.664,1.359 -3.789,2.948 2.625,-0.255 3.707,0.578 4.457,1.495 -0.02,0.54 -0.075,1.686 -0.126,2.454 C 0.381,-2.665 1.27,-0.375 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FA743E" d="M35.838 23.159c.003.553-.443 1.002-.998 1.003l-5 .013c-.552.002-.999-.446-1-.997-.003-.555.444-1.002.995-1.004l5-.013c.553 0 1.002.445 1.003.998zm-1.587-5.489c.238.499.025 1.095-.475 1.333l-4.517 2.145c-.498.236-1.094.023-1.33-.476-.239-.498-.025-1.094.474-1.333l4.516-2.144c.5-.236 1.095-.024 1.332.475zm.027 10.987c.234-.501.02-1.096-.48-1.33l-4.527-2.122c-.501-.235-1.095-.02-1.33.48-.234.501-.019 1.096.482 1.33l4.526 2.123c.499.234 1.096.019 1.329-.481z"/><path fill="#292F33" d="M27.979 14.875c-1.42-.419-2.693-1.547-3.136-2.25-.76-1.208.157-1.521-.153-4.889C24.405 4.653 20.16 1.337 15 1c-2.346-.153-4.786.326-7.286 1.693-6.42 3.511-8.964 10.932-4.006 18.099 4.47 6.46.276 9.379.276 9.379s.166 1.36 2.914 3.188c2.749 1.827 6.121.588 6.121.588s1.112-3.954 4.748-3.59c2.606.384 6.266-.129 7.191-1.024.865-.837-.151-1.886.539-4.224-2.365-.232-3.665-1.359-3.79-2.948 2.625.255 3.708-.578 4.458-1.495-.021-.54-.075-1.686-.127-2.454 2.322-.672 3.212-2.962 1.941-3.337z"/></svg>
\ No newline at end of file