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/1f437.svg b/public/emoji/1f437.svg
index 41fe6ff8a..49175ea42 100644
--- a/public/emoji/1f437.svg
+++ b/public/emoji/1f437.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.1934,22.6709)" id="g20"><path id="path22" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.387,0.371 0.733,0.795 1.02,1.28 1.685,2.853 0.269,10.292 -0.592,10.8 -0.696,0.411 -5.53,-1.05 -8.246,-3.132 -2.499,1.497 -5.344,2.381 -8.375,2.381 -3.022,0 -5.856,-0.879 -8.349,-2.367 -2.721,2.075 -7.533,3.528 -8.227,3.118 -0.861,-0.508 -2.276,-7.947 -0.592,-10.8 0.278,-0.471 0.615,-0.884 0.989,-1.249 -1.156,-2.551 -1.821,-5.342 -1.821,-8.18 0,-9.99 8.01,-12.522 18,-12.522 9.989,0 18,2.532 18,12.522 C 1.807,-5.322 1.146,-2.544 0,0"/></g><g transform="translate(7.3979,30.0352)" id="g24"><path id="path26" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.166,1.268 -4.402,2.08 -4.8,1.845 -5.37,1.509 -5.883,-3.153 -5.151,-6.419 -3.879,-3.938 -2.112,-1.738 0,0"/></g><g transform="translate(33.7529,23.6157)" id="g28"><path id="path30" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.732,3.267 0.219,7.928 -0.351,8.265 -0.749,8.499 -2.985,7.687 -5.151,6.419 -3.038,4.682 -1.271,2.482 0,0"/></g><g transform="translate(28,12.875)" id="g32"><path id="path34" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.487 -3.097,-9.375 -10,-9.375 -6.904,0 -10,4.888 -10,9.375 0,4.487 3.096,5.625 10,5.625 C -3.097,5.625 0,4.487 0,0"/></g><g transform="translate(15,11.4004)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.857 -0.34,-2.4 -1.5,-2.4 -2.66,-2.4 -3,-1.857 -3,0 -3,1.856 -2.66,2.399 -1.5,2.399 -0.34,2.399 0,1.856 0,0"/></g><g transform="translate(24,11.4004)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.857 -0.34,-2.4 -1.5,-2.4 -2.66,-2.4 -3,-1.857 -3,0 -3,1.856 -2.66,2.399 -1.5,2.399 -0.34,2.399 0,1.856 0,0"/></g><g transform="translate(9,19)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(31,19)" id="g48"><path id="path50" style="fill:#292f33;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></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4ABBA" d="M34.193 13.329c.387-.371.733-.795 1.019-1.28 1.686-2.854.27-10.292-.592-10.8-.695-.411-5.529 1.05-8.246 3.132C23.876 2.884 21.031 2 18 2c-3.021 0-5.856.879-8.349 2.367C6.93 2.293 2.119.839 1.424 1.249c-.861.508-2.276 7.947-.592 10.8.278.471.615.884.989 1.249C.666 15.85 0 18.64 0 21.479 0 31.468 8.011 34 18 34s18-2.532 18-12.521c0-2.828-.66-5.606-1.807-8.15z"/><path fill="#EA596E" d="M7.398 5.965c-2.166-1.267-4.402-2.08-4.8-1.845-.57.337-1.083 4.998-.352 8.265 1.273-2.483 3.04-4.682 5.152-6.42zm26.355 6.419c.733-3.267.219-7.928-.351-8.265-.398-.235-2.635.578-4.801 1.845 2.114 1.739 3.88 3.938 5.152 6.42zM28 23.125c0 4.487-3.097 9.375-10 9.375-6.904 0-10-4.888-10-9.375S11.096 17.5 18 17.5c6.903 0 10 1.138 10 5.625z"/><path fill="#662113" d="M15 24.6c0 1.857-.34 2.4-1.5 2.4s-1.5-.543-1.5-2.4c0-1.856.34-2.399 1.5-2.399s1.5.542 1.5 2.399zm9 0c0 1.857-.34 2.4-1.5 2.4s-1.5-.543-1.5-2.4c0-1.856.34-2.399 1.5-2.399s1.5.542 1.5 2.399z"/><circle fill="#292F33" cx="7" cy="17" r="2"/><circle fill="#292F33" cx="29" cy="17" r="2"/></svg>
\ No newline at end of file