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/1f302.svg b/public/emoji/1f302.svg
index 881160d3a..e611e6b83 100644
--- a/public/emoji/1f302.svg
+++ b/public/emoji/1f302.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 14.211,28.895 2,4 3,3 4,2 28.895,14.211 c 0.723,0.362 1.158,1.124 1.1,1.93 l 0,0 c -0.057,0.807 -0.596,1.501 -1.362,1.756 l 0,0 L 27,18.441 27,20 c 0,0.918 -0.625,1.718 -1.515,1.94 l 0,0 -2.836,0.709 -0.709,2.836 C 21.718,26.375 20.918,27 20,27 l 0,0 -1.559,0 -0.544,1.633 c -0.255,0.767 -0.948,1.305 -1.756,1.362 l 0,0 C 16.094,29.999 16.047,30 15.999,30 l 0,0 c -0.752,0 -1.447,-0.425 -1.788,-1.105"/></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(1,1)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,1 0,2 0,2 l 26,26 c 0,0 1.48,1.521 0,3 -1.479,1.479 -3,0 -3,0 0,0 -1,-1 -2,0 -1,1 0,2 0,2 0,0 3.521,3.479 7,0 3.5,-3.5 0,-7 0,-7 L 2,0 C 2,0 1,-1 0,0"/></g><g transform="translate(3,3)" id="g24"><path id="path26" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,1 12.211,24.895 c 0.341,0.68 1.036,1.105 1.788,1.105 0.048,0 0.095,-0.001 0.143,-0.005 0.807,-0.058 1.5,-0.595 1.756,-1.363 L 15.441,24 17,24 c 0.918,0 1.718,-0.625 1.94,-1.515 l 0.709,-2.836 2.836,-0.709 C 23.375,18.718 24,17.918 24,17 l 0,-1.559 1.633,-0.543 c 0.766,-0.256 1.304,-0.95 1.362,-1.756 0.058,-0.807 -0.377,-1.569 -1.1,-1.931 L 1,-1 0,0 Z"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(21,31)" id="g36"><path id="path38" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -19,-28 0,-1 21,21 -2,8 z"/></g><g transform="translate(29,20)" id="g40"><path id="path42" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -26,-18 2,-1 29,13 -5,6 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M35 35c1-1 0-2 0-2L9 7S7.521 5.479 9 4s3 0 3 0 1 1 2 0 0-2 0-2-3.521-3.479-7 0C3.5 5.5 7 9 7 9l26 26s1 1 2 0z"/><path fill="#9266CC" d="M7.367 18.102L9 17.559V16c0-.918.625-1.718 1.515-1.94l2.836-.709.709-2.836C14.282 9.625 15.082 9 16 9h1.559l.544-1.632c.256-.768.949-1.305 1.756-1.363.047-.004.094-.005.141-.005.753 0 1.448.425 1.789 1.105L34 32l-2 2L7.106 21.789c-.724-.362-1.158-1.124-1.101-1.931.057-.806.596-1.5 1.362-1.756z"/><path fill="#744EAA" d="M33 33L13.351 13.351l.709-2.836C14.282 9.625 15.082 9 16 9h1.559l.051-.154 15.986 23.558L33 33zm-1 1L7.106 21.789c-.724-.362-1.158-1.124-1.101-1.931.058-.807.596-1.5 1.362-1.756L9 17.559v-.174l23.409 16.206L32 34z"/></svg>
\ No newline at end of file