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/1f92b.svg b/public/emoji/1f92b.svg
index 819a7c792..a00edc96c 100644
--- a/public/emoji/1f92b.svg
+++ b/public/emoji/1f92b.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,20)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-8.837 -7.163,-16 -16,-16 -8.836,0 -16,7.163 -16,16 0,8.836 7.164,16 16,16 C -7.163,16 0,8.836 0,0"/></g><g transform="translate(22,14)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -1.793,-2 -4,-2 -2.209,0 -4,0.895 -4,2 0,1.104 1.791,2 4,2 2.207,0 4,-0.896 4,-2"/></g><g transform="translate(30.0008,27)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.305,0 -0.605,0.138 -0.801,0.4 -3.441,3.921 -6.862,3.999 -7.007,4 -7.557,4.006 -8.001,4.456 -7.998,5.005 -7.995,5.556 -7.551,6 -7.001,6 -6.817,6 -2.464,5.95 0.799,1.6 1.131,1.158 1.041,0.531 0.599,0.2 0.419,0.065 0.209,0 0,0"/></g><g transform="translate(5.999,27)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.208,0 -0.419,0.065 -0.599,0.2 -0.442,0.331 -0.531,0.958 -0.2,1.4 3.262,4.35 7.616,4.4 7.8,4.4 0.552,0 1,-0.448 1,-1 C 8.001,4.449 7.556,4.002 7.005,4 6.85,3.998 3.437,3.914 0.801,0.4 0.604,0.138 0.304,0 0,0"/></g><g transform="translate(14,24.5)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -0.96,-2.5 -2.143,-2.5 -1.184,0 -2.143,1.119 -2.143,2.5 0,1.381 0.959,2.5 2.143,2.5 C -0.96,2.5 0,1.381 0,0"/></g><g transform="translate(27,24.6668)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.289 -0.895,-2.333 -2,-2.333 -1.104,0 -2,1.044 -2,2.333 0,1.288 0.896,2.333 2,2.333 1.105,0 2,-1.045 2,-2.333"/></g><g transform="translate(15.7696,6.1507)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -1.078,0.22 -1.779,1.282 -1.559,2.36 l 2.204,10.777 c 0.22,1.078 1.282,1.779 2.36,1.559 l 0,0 c 1.077,-0.22 1.779,-1.282 1.559,-2.36 L 2.36,1.559 C 2.14,0.481 1.078,-0.22 0,0"/></g><g transform="translate(16.5272,-0.1283)" id="g48"><path id="path50" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.959,0.401 c -1.078,0.22 -1.78,1.282 -1.559,2.36 l 1.602,7.838 c 0.221,1.077 1.283,1.779 2.36,1.558 L 4.363,11.356 C 6.519,10.915 7.922,8.791 7.481,6.636 L 7.08,4.677 C 6.419,1.443 3.233,-0.661 0,0"/></g><g transform="translate(20.0584,1.8249)" id="g52"><path id="path54" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 C -0.937,0.576 -1.233,1.814 -0.658,2.751 L 2.86,8.479 c 0.576,0.937 1.814,1.233 2.751,0.658 l 0,0 C 6.548,8.561 6.844,7.323 6.269,6.386 L 2.751,0.658 C 2.175,-0.28 0.937,-0.576 0,0"/></g><g transform="translate(22.4375,5.6875)" id="g56"><path id="path58" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.022,0 -0.046,0.002 -0.07,0.007 -0.203,0.038 -0.337,0.234 -0.298,0.438 0.065,0.345 -0.002,0.649 -0.207,0.928 -0.653,0.893 -2.53,1.299 -3.198,1.38 -0.206,0.024 -0.352,0.212 -0.328,0.417 0.025,0.205 0.204,0.354 0.417,0.327 C -3.572,3.484 -0.949,3.154 0.03,1.816 0.359,1.366 0.474,0.857 0.368,0.305 0.334,0.125 0.177,0 0,0"/></g><g transform="translate(18.835,0.459)" id="g60"><path id="path62" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.279,0 -0.586,0.034 -0.921,0.113 -0.674,0.159 -1.15,0.552 -1.305,1.078 -0.13,0.444 -0.011,0.913 0.32,1.255 0.429,0.445 1.108,0.59 1.873,0.396 C 0.167,2.791 0.288,2.587 0.237,2.386 0.187,2.187 -0.016,2.064 -0.219,2.115 -0.711,2.241 -1.13,2.171 -1.366,1.926 -1.507,1.78 -1.56,1.584 -1.506,1.403 -1.43,1.143 -1.154,0.938 -0.749,0.844 0.555,0.537 1.277,1.05 1.654,1.534 c 0.562,0.722 0.628,1.7 0.428,2.084 -0.467,0.898 -2.265,1.097 -2.917,1.098 -0.207,0 -0.375,0.168 -0.375,0.375 10e-4,0.207 0.168,0.375 0.375,0.375 0.114,0 2.81,-0.017 3.583,-1.502 C 3.085,3.317 2.989,2.028 2.246,1.074 1.906,0.637 1.204,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCB4C" d="M35 17c0 9.389-7.611 17-17 17S1 26.389 1 17 8.611 0 18 0s17 7.611 17 17"/><ellipse fill="#65471B" cx="17.812" cy="23.125" rx="4.062" ry="1.93"/><path fill="#F19020" d="M25.35 25.981l-.033-.02c-.839-.515-1.947-.25-2.462.589l-.151.245c-.542-.562-1.25-.974-2.068-1.141l-1.399-.286 1.272-6.224c.197-.965-.431-1.915-1.395-2.112l-.038-.008c-.965-.197-1.915.431-2.112 1.395l-1.673 8.183-.015.074-.313 1.531-.001.01-1.128 5.533c-.22 1.078.27 2.25 1.895 2.25H19c2.804 0 3.635-1.01 4.198-3.093l2.741-4.463c.514-.839.25-1.947-.589-2.463z"/><path fill="#65471B" d="M22.409 30.743c-.02 0-.042-.002-.064-.006-.184-.034-.305-.212-.269-.397.059-.312-.002-.587-.187-.839-.59-.808-2.289-1.175-2.894-1.248-.186-.022-.319-.192-.296-.377.022-.186.184-.321.377-.296.101.011 2.474.31 3.36 1.521.298.407.401.868.306 1.368-.031.161-.173.274-.333.274zm-3.259 4.73c-.253 0-.53-.031-.833-.102-.61-.144-1.04-.499-1.18-.975-.118-.401-.01-.825.289-1.135.388-.402 1.003-.534 1.695-.358.181.046.291.231.245.413-.046.18-.229.291-.413.245-.445-.114-.825-.05-1.038.171-.128.132-.175.309-.127.473.069.236.319.421.685.506 1.18.277 1.833-.186 2.174-.625.508-.653.568-1.538.387-1.885-.422-.812-2.049-.992-2.64-.993-.187 0-.339-.152-.339-.339 0-.187.152-.339.339-.339.103 0 2.542.015 3.242 1.359.305.585.218 1.751-.454 2.614-.308.394-.943.97-2.032.97zm-4.928-22.251c0 1.391-.846 2.519-1.889 2.519-1.043 0-1.889-1.127-1.889-2.519 0-1.391.845-2.519 1.889-2.519 1.043.001 1.889 1.128 1.889 2.519zm15.664-2.951c.222 0 .445-.069.637-.213.47-.352.564-1.018.212-1.487-3.466-4.622-8.092-4.675-8.287-4.675-.587 0-1.062.476-1.062 1.063 0 .585.473 1.06 1.058 1.062.166.002 3.792.091 6.592 3.825.208.278.527.425.85.425zm-8.108 2.951c0 1.391.846 2.519 1.889 2.519 1.043 0 1.889-1.127 1.889-2.519 0-1.391-.845-2.519-1.889-2.519-1.044.001-1.889 1.128-1.889 2.519zM6.114 10.271c-.222 0-.445-.069-.637-.213-.469-.352-.564-1.018-.212-1.487 3.466-4.622 8.092-4.675 8.287-4.675.587 0 1.062.476 1.062 1.063 0 .585-.473 1.06-1.058 1.062-.166.002-3.792.091-6.592 3.825-.208.278-.527.425-.85.425z"/></svg>
\ No newline at end of file