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/1f51b.svg b/public/emoji/1f51b.svg
index 8e41094fe..eeed72c1f 100644
--- a/public/emoji/1f51b.svg
+++ b/public/emoji/1f51b.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.3105,29.3481)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10.141,6.389 c -0.904,0.569 -1.644,0.181 -1.644,-0.865 l 0,-1.873 -11.051,0 0,1.873 c 0,1.046 -0.74,1.434 -1.644,0.865 L -34.621,0 c -0.904,-0.57 -0.922,-1.527 -0.037,-2.127 l 10.215,-6.932 c 0.884,-0.602 1.607,-0.234 1.607,0.812 l 0,1.898 11.051,0 0,-1.898 c 0,-1.047 0.722,-1.413 1.607,-0.812 L 0.037,-2.127 C 0.922,-1.527 0.904,-0.57 0,0"/></g><g transform="translate(11.7881,8.0137)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.635 -1.372,5.01 -4.094,5.01 -2.721,0 -4.094,-2.375 -4.094,-5.01 0,-2.656 1.33,-5.008 4.094,-5.008 C -1.329,-5.008 0,-2.656 0,0 m -11.584,0 c 0,4.529 3.048,8.014 7.49,8.014 4.377,0 7.491,-3.594 7.491,-8.014 0,-4.506 -3.027,-8.014 -7.491,-8.014 -4.42,0 -7.49,3.508 -7.49,8.014"/></g><g transform="translate(16.4131,14.1982)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.089 0.696,1.699 1.632,1.699 0.415,0 1.09,-0.327 1.373,-0.719 l 6.902,-9.211 0.045,0 0,8.231 c 0,1.089 0.694,1.699 1.633,1.699 0.936,0 1.633,-0.61 1.633,-1.699 l 0,-12.368 c 0,-1.088 -0.697,-1.697 -1.633,-1.697 -0.415,0 -1.067,0.326 -1.372,0.716 l -6.903,9.102 -0.044,0 0,-8.121 c 0,-1.088 -0.698,-1.697 -1.634,-1.697 -0.936,0 -1.632,0.609 -1.632,1.697 L 0,0 Z"/></g><g transform="translate(32.5566,14.5469)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.914 0.673,1.48 1.567,1.48 2.438,1.48 3.135,0.893 3.135,0 l 0,-8.384 C 3.135,-9.277 2.438,-9.863 1.567,-9.863 0.673,-9.863 0,-9.299 0,-8.384 L 0,0 Z m -0.131,-12.848 c 0,0.936 0.762,1.7 1.698,1.7 0.936,0 1.699,-0.764 1.699,-1.7 0,-0.935 -0.763,-1.699 -1.699,-1.699 -0.936,0 -1.698,0.764 -1.698,1.699"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M35.311 6.652L25.17.263c-.904-.569-1.645-.181-1.645.865V3h-11.05V1.128c0-1.046-.74-1.434-1.644-.865L.689 6.652c-.904.57-.922 1.527-.037 2.127l10.215 6.932c.885.602 1.607.234 1.607-.812V13h11.051v1.899c0 1.046.723 1.413 1.607.811l10.215-6.931c.885-.6.868-1.557-.036-2.127zM.204 27.986c0-4.529 3.048-8.014 7.49-8.014 4.377 0 7.491 3.594 7.491 8.014 0 4.506-3.027 8.014-7.491 8.014-4.42 0-7.49-3.508-7.49-8.014zm11.584 0c0-2.635-1.372-5.01-4.094-5.01-2.721 0-4.094 2.375-4.094 5.01 0 2.656 1.33 5.008 4.094 5.008 2.765 0 4.094-2.351 4.094-5.008zm4.625-6.184c0-1.089.696-1.699 1.632-1.699.415 0 1.089.327 1.373.72l6.902 9.211h.045v-8.231c0-1.089.694-1.699 1.633-1.699.937 0 1.633.61 1.633 1.699V34.17c0 1.088-.696 1.697-1.633 1.697-.415 0-1.067-.326-1.372-.717l-6.903-9.102h-.044v8.121c0 1.088-.697 1.697-1.633 1.697s-1.632-.609-1.632-1.697V21.802zm16.013 12.499c0-.936.762-1.699 1.698-1.699.936 0 1.698.764 1.698 1.699 0 .936-.763 1.699-1.698 1.699-.936 0-1.698-.764-1.698-1.699zm.131-12.848c0-.914.673-1.48 1.567-1.48.87 0 1.567.588 1.567 1.48v8.384c0 .894-.697 1.479-1.567 1.479-.895 0-1.567-.564-1.567-1.479v-8.384z"/></svg>
\ No newline at end of file