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/1f3ad.svg b/public/emoji/1f3ad.svg
index de1ca17bb..c8c990126 100644
--- a/public/emoji/1f3ad.svg
+++ b/public/emoji/1f3ad.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(22,31.4126)" id="g20"><path id="path22" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.075 -3.667,-18.333 -11,-18.333 -7.333,0 -11,12.258 -11,18.333 0,7.181 8.25,3.667 11,3.667 2.712,0 11,3.552 11,-3.667"/></g><g transform="translate(5.5,24.0796)" id="g24"><path id="path26" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4.583,-2.75 7.333,-2.75 11,0 13.75,1.833 9.167,-6.417 5.5,-6.417 1.833,-6.417 -2.75,1.833 0,0"/></g><g transform="translate(3.666,27.7456)" id="g28"><path id="path30" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.138,0 -0.278,0.031 -0.41,0.097 -0.862,0.324 -1.046,0.874 -0.819,1.327 -0.183,2.6 1.114,3.477 2.484,3.563 3.323,3.609 4.942,3.407 6.263,1.425 6.544,1.004 6.43,0.435 6.009,0.154 5.586,-0.126 5.018,-0.013 4.738,0.409 4.127,1.324 3.383,1.782 2.598,1.732 1.868,1.687 1.17,1.206 0.82,0.507 0.66,0.186 0.336,0 0,0"/></g><g transform="translate(18.334,27.7456)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.336,0 -0.66,0.186 -0.82,0.507 -0.35,0.699 -1.048,1.18 -1.778,1.225 -0.776,0.042 -1.529,-0.408 -2.14,-1.323 -0.282,-0.422 -0.85,-0.535 -1.271,-0.255 -0.421,0.281 -0.535,0.85 -0.254,1.271 1.32,1.983 2.931,2.186 3.779,2.138 C -1.114,3.477 0.183,2.6 0.819,1.327 1.046,0.874 0.862,0.324 0.41,0.097 0.278,0.031 0.138,0 0,0"/></g><g transform="translate(36,18.3335)" id="g36"><path id="path38" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.075 -3.667,-18.333 -11,-18.333 -7.333,0 -11,12.258 -11,18.333 0,7.181 8.25,3.667 11,3.667 2.713,0 11,3.552 11,-3.667"/></g><g transform="translate(29.5,5.8486)" id="g40"><path id="path42" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.5,2.151 -5.5,2.151 -9,0 -2.75,-1.833 0.833,4.417 4.5,4.417 3.667,0 7.25,-6.25 4.5,-4.417"/></g><g transform="translate(16.9995,14.083)" id="g44"><path id="path46" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.138,0 -0.278,0.031 -0.41,0.097 -0.452,0.226 -0.636,0.777 -0.409,1.23 0.699,1.4 2.404,2.49 4.051,2.592 C 4.721,4.019 6.046,3.334 6.93,2.009 7.211,1.587 7.097,1.019 6.676,0.737 6.255,0.456 5.686,0.57 5.405,0.991 4.883,1.773 4.19,2.139 3.346,2.09 2.225,2.02 1.182,1.23 0.82,0.507 0.66,0.186 0.336,0 0,0"/></g><g transform="translate(33.001,14.083)" id="g48"><path id="path50" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.337,0 -0.66,0.186 -0.821,0.508 -1.182,1.23 -2.225,2.02 -3.346,2.09 -4.187,2.137 -4.885,1.773 -5.405,0.991 -5.686,0.57 -6.256,0.456 -6.677,0.737 c -0.421,0.282 -0.535,0.85 -0.254,1.272 0.884,1.325 2.188,2.009 3.699,1.91 C -1.583,3.816 0.12,2.726 0.819,1.326 1.045,0.874 0.861,0.323 0.408,0.097 0.277,0.031 0.138,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#A6D388" d="M22 4.587c0 6.075-3.667 18.333-11 18.333S0 10.663 0 4.587C0-2.593 8.25.92 11 .92c2.712 0 11-3.551 11 3.667z"/><path fill="#5C913B" d="M5.5 11.92c4.583 2.75 7.333 2.75 11 0 2.75-1.833-1.833 6.417-5.5 6.417s-8.25-8.25-5.5-6.417zM3.666 8.254c-.138 0-.278-.031-.41-.097-.452-.226-.636-.777-.409-1.23.636-1.272 1.933-2.15 3.303-2.235.839-.047 2.458.155 3.779 2.137.281.421.167.99-.254 1.271-.423.281-.991.167-1.271-.254-.61-.915-1.355-1.374-2.14-1.324-.73.045-1.428.526-1.777 1.226-.161.32-.485.506-.821.506zm14.668 0c-.336 0-.66-.186-.82-.507-.35-.699-1.047-1.18-1.777-1.226-.776-.042-1.529.409-2.14 1.324-.282.422-.85.535-1.271.254-.421-.281-.535-.85-.254-1.271 1.32-1.983 2.931-2.186 3.779-2.137 1.37.085 2.667.963 3.303 2.235.227.453.043 1.003-.41 1.23-.132.067-.272.098-.41.098z"/><path fill="#CBB7EA" d="M36 17.667C36 23.741 32.333 36 25 36S14 23.741 14 17.667C14 10.486 22.25 14 25 14c2.713 0 11-3.552 11 3.667z"/><path fill="#9266CC" d="M29.5 30.151C26 28 24 28 20.5 30.151c-2.75 1.833.833-4.417 4.5-4.417s7.25 6.25 4.5 4.417zM17 21.917c-.138 0-.278-.031-.41-.097-.453-.226-.636-.777-.41-1.23.7-1.399 2.404-2.49 4.051-2.592 1.489-.099 2.815.585 3.698 1.911.281.422.167.99-.254 1.272-.421.281-.99.167-1.271-.254-.522-.782-1.215-1.148-2.059-1.099-1.121.069-2.164.859-2.526 1.583-.16.32-.484.506-.819.506zm16.001 0c-.337 0-.66-.186-.821-.508-.36-.723-1.403-1.512-2.524-1.582-.842-.047-1.539.316-2.06 1.099-.28.421-.851.535-1.271.254-.421-.281-.535-.85-.254-1.272.884-1.326 2.188-2.009 3.699-1.911 1.648.103 3.352 1.194 4.051 2.593.226.452.042 1.003-.411 1.229-.132.067-.271.098-.409.098z"/></svg>
\ No newline at end of file