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/1f390.svg b/public/emoji/1f390.svg
index f2c5c6ea8..9aebc7979 100644
--- a/public/emoji/1f390.svg
+++ b/public/emoji/1f390.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(17,0)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.32,0 -9.241,0.826 -10.707,2.293 -0.215,0.216 -0.321,0.518 -0.287,0.82 0.035,0.303 0.205,0.573 0.464,0.735 4.563,2.852 6.825,7.968 6.541,14.796 C -3.996,18.805 -4,18.925 -4,19 c 0,0.552 0.448,1 1,1 l 9,0 C 6.523,20 6.957,19.598 6.997,19.077 7.838,8.146 4.529,3.294 3.067,1.716 2.043,0.609 0.954,0 0,0"/></g><g transform="translate(18,18)" id="g24"><path id="path26" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,3 C -1,4.552 -0.552,5 0,5 0.552,5 1,4.552 1,4 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(26,26)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.419 -3.582,-5 -8,-5 -4.419,0 -8,0.581 -8,5 0,4.418 3.581,8 8,8 4.418,0 8,-3.582 8,-8"/></g><g transform="translate(18,32)" id="g32"><path id="path34" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,2 C -1,3.552 -0.552,4 0,4 0.552,4 1,3.552 1,3 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(20,15)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(19,9)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(16,3.5)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.895,-1.5 -2,-1.5 -1.104,0 -2,0.672 -2,1.5 0,0.828 0.896,1.5 2,1.5 1.105,0 2,-0.672 2,-1.5"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M17 36c-1.32 0-9.241-.826-10.707-2.293-.215-.216-.321-.518-.287-.82.035-.303.205-.573.464-.734 4.563-2.853 6.825-7.969 6.541-14.796-.007-.162-.011-.282-.011-.357 0-.552.448-1 1-1h9c.522 0 .957.402.997.923.841 10.931-2.468 15.783-3.93 17.361C19.043 35.391 17.954 36 17 36z"/><path fill="#3E721D" d="M18 18c-.552 0-1-.448-1-1v-3c0-.552.448-1 1-1s1 .448 1 1v3c0 .552-.448 1-1 1z"/><path fill="#77B255" d="M26 10c0 4.418-3.582 5-8 5s-8-.582-8-5 3.582-8 8-8 8 3.582 8 8z"/><path fill="#3E721D" d="M18 4c-.552 0-1-.448-1-1V1c0-.552.448-1 1-1s1 .448 1 1v2c0 .552-.448 1-1 1z"/><circle fill="#FFF" cx="18" cy="21" r="2"/><circle fill="#FFF" cx="17" cy="27" r="2"/><ellipse fill="#FFF" cx="14" cy="32.5" rx="2" ry="1.5"/></svg>
\ No newline at end of file