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/1f6ad.svg b/public/emoji/1f6ad.svg
index 504d2aaf3..bda285a59 100644
--- a/public/emoji/1f6ad.svg
+++ b/public/emoji/1f6ad.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,18)" 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 9.389,0 17,7.611 17,17"/></g><g transform="translate(23.7031,19)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.017,0 c -0.407,0 -0.733,0.261 -0.733,0.668 0,0.219 0.082,2.149 2.929,4.047 1.474,0.984 1.784,2.61 1.447,3.721 -0.315,1.042 -1.164,1.63 -2.328,1.63 -1.771,0 -2.26,-0.957 -2.394,-1.524 -0.169,-0.714 0.046,-1.179 0.268,-1.369 0.325,-0.279 0.8,-0.218 1.075,-0.049 0.196,0.122 0.301,0.331 0.301,0.606 0,0.415 0.336,0.75 0.75,0.75 0.414,0 0.75,-0.336 0.75,-0.75 0,-0.799 -0.369,-1.485 -1.013,-1.883 -0.721,-0.446 -1.832,-0.4 -2.557,0.005 -0.886,0.494 -1.337,1.743 -1.034,3.03 0.396,1.675 1.836,2.675 3.854,2.675 1.844,0 3.251,-1.011 3.764,-2.704 C 5.663,6.867 4.819,4.637 3.011,3.431 0.838,1.982 0.752,0.708 0.75,0.652 0.732,0.251 0.4,0 0,0"/></g><g transform="translate(22,17)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c 0,0 -2,0 -2,-2 l 0,-1 c 0,-2 2,-2 2,-2 l 16,0 0,5 z"/></g><g transform="translate(27,17)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,-5 3,0 c 0,0 2,0 2,2 l 0,1 C 2,0 0,0 0,0"/></g><g transform="translate(2,18)" id="g36"><path id="path38" 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"><circle cx="18" cy="18" r="17"/><path fill="#FFF" d="M23.703 17h-.017c-.407 0-.733-.261-.733-.668 0-.219.082-2.149 2.929-4.047 1.475-.983 1.784-2.609 1.447-3.721-.315-1.042-1.164-1.63-2.328-1.63-1.771 0-2.26.957-2.394 1.524-.169.713.046 1.179.268 1.369.325.279.8.218 1.075.049.196-.122.301-.331.301-.606 0-.414.336-.75.75-.75s.75.336.75.75c0 .799-.369 1.485-1.013 1.883-.721.446-1.832.4-2.557-.004-.886-.494-1.337-1.743-1.034-3.031.396-1.674 1.836-2.674 3.854-2.674 1.844 0 3.251 1.011 3.764 2.704.602 1.986-.242 4.215-2.051 5.421-2.173 1.449-2.259 2.723-2.261 2.779-.018.402-.349.652-.75.652zM22 19H6s-2 0-2 2v1c0 2 2 2 2 2h16v-5zm5 0h-3v5h3s2 0 2-2v-1c0-2-2-2-2-2z"/><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