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/1f6b1.svg b/public/emoji/1f6b1.svg
index de985691e..5d2b5a011 100644
--- a/public/emoji/1f6b1.svg
+++ b/public/emoji/1f6b1.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 -16.999,7.611 -16.999,17 0,9.389 7.61,16.999 16.999,16.999 9.389,0 17,-7.61 17,-16.999"/></g><g transform="translate(17,17)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,0 -1,-1 -1,-1 l 0,-4 -6,0 0,4 C -7,-1 -7.021,0 -8.021,0 -9.021,0 -9,-1 -9,-1 l 0,-8 c 0,0 0,-2 2,-2 l 6,0 c 2,0 2,2 2,2 l 0,8 c 0,0 0,1 -1,1"/></g><g transform="translate(28,26)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9,0 0,4 0,1 c 0,0 0,1 -1,1 -1,0 -1,-1 -1,-1 l 0,-1 0,-4 c -6,0 -6,-6 -6,-6 l 0,-1 c 0,-1 1,-1 1,-1 l 2,0 c 0,0 1,0 1,1 l 0,0.207 0,0.793 c 0,2 2,2 2,2 l 11,0 c 1,0 1,1 1,1 l 0,2 c 0,0 0,1 -1,1"/></g><g transform="translate(16,31)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 l 2,0 c 0.552,0 1,0.448 1,1 0,0.552 -0.448,1 -1,1"/></g><g transform="translate(20,29)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,0 C 2.553,0 3,0.448 3,1 3,1.552 2.553,2 2,2 L 0,2 C -0.553,2 -1,1.552 -1,1 -1,0.448 -0.553,0 0,0"/></g><g transform="translate(2,17.9995)" id="g40"><path id="path42" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3.968 1.453,7.592 3.845,10.388 L 26.388,-12.156 C 23.592,-14.547 19.968,-15.999 16,-15.999 7.164,-15.999 0,-8.836 0,0 m 32,0 c 0,-3.968 -1.453,-7.591 -3.845,-10.388 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.941 -2,0 c 0,-9.941 8.059,-17.999 18,-17.999 9.941,0 18,8.058 18,17.999 0,9.941 -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 17S1 27.388 1 17.999 8.61 1 17.999 1s17 7.61 17 16.999z"/><path fill="#FFF" d="M17 19c-1 0-1 1-1 1v4h-6v-4s-.021-1-1.021-1S8 20 8 20v8s0 2 2 2h6c2 0 2-2 2-2v-8s0-1-1-1z"/><g fill="#FFF"><path d="M28 10h-9V5s0-1-1-1-1 1-1 1v5c-6 0-6 6-6 6v1c0 1 1 1 1 1h2s1 0 1-1v-1c0-2 2-2 2-2h11c1 0 1-1 1-1v-2s0-1-1-1z"/><path d="M16 5h-2c-.552 0-1 .448-1 1s.448 1 1 1h2c.552 0 1-.448 1-1s-.448-1-1-1zm4 2h2c.553 0 1-.448 1-1s-.447-1-1-1h-2c-.553 0-1 .448-1 1s.447 1 1 1z"/></g><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.968-1.453 7.591-3.845 10.388L7.612 5.845C10.409 3.453 14.032 2 18 2c8.837 0 16 7.164 16 16zM2 18c0-3.968 1.453-7.592 3.845-10.388l22.543 22.544C25.592 32.548 21.968 34 18 34 9.164 34 2 26.837 2 18z"/></svg>
\ No newline at end of file