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/1f63f.svg b/public/emoji/1f63f.svg
index 1a0b5017e..4cc6054c2 100644
--- a/public/emoji/1f63f.svg
+++ b/public/emoji/1f63f.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(36,16)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-10 -11,-16 -18,-16 -7,0 -18,6.059 -18,16 0,9.941 4,20 18,20 C -4,20 0,10 0,0"/></g><g transform="translate(35,35)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-1 0,-11 0,-11 l -8,10 c 0,0 7,2 8,1"/></g><g transform="translate(1,35)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1,-1 0,-11 0,-11 L 8,-1 C 8,-1 1,1 0,0"/></g><g transform="translate(25.3623,5.3643)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.483,0.766 -3.415,5.136 -7.363,5.136 -4.234,0 -7.3,-5.029 -7.428,-5.243 -0.121,-0.201 -0.086,-0.457 0.083,-0.62 0.096,-0.09 0.221,-0.137 0.346,-0.137 0.096,0 0.193,0.027 0.277,0.084 0.029,0.019 2.918,1.916 6.722,1.916 3.792,0 6.695,-1.898 6.723,-1.916 0.086,-0.058 0.215,-0.096 0.282,-0.084 0.277,0.004 0.515,0.218 0.515,0.5 C 0.157,-0.221 0.098,-0.092 0,0"/></g><g transform="translate(14,21.5)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -0.895,-3.5 -2,-3.5 -1.104,0 -2,1.567 -2,3.5 0,1.933 0.896,3.5 2,3.5 1.105,0 2,-1.567 2,-3.5"/></g><g transform="translate(26,21.5)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -0.895,-3.5 -2,-3.5 -1.104,0 -2,1.567 -2,3.5 0,1.933 0.896,3.5 2,3.5 1.105,0 2,-1.567 2,-3.5"/></g><g transform="translate(17.9995,16.5)" id="g44"><path id="path46" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.001,0 3.001,-0.5 3.001,-1.5 0,-1 -1.5,-3 -3.001,-3 -1.5,0 -3,2 -3,3 0,1 -10e-4,1.5 3,1.5"/></g><g transform="translate(26,15.5)" id="g48"><path id="path50" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.209,0 -0.404,0.133 -0.475,0.342 -0.086,0.262 0.055,0.545 0.317,0.633 l 9,2.999 C 9.105,4.062 9.387,3.92 9.475,3.658 9.562,3.396 9.42,3.113 9.158,3.026 l -9,-3.001 C 0.105,0.008 0.053,0 0,0"/></g><g transform="translate(24.999,13.5)" id="g52"><path id="path54" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.233,0 -0.441,0.164 -0.489,0.402 -0.055,0.271 0.121,0.534 0.392,0.588 l 10,2 C 10.163,3.044 10.436,2.87 10.491,2.598 10.546,2.327 10.37,2.064 10.099,2.01 l -10,-2 C 0.066,0.003 0.033,0 0,0"/></g><g transform="translate(10,15.5)" id="g56"><path id="path58" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.052,0 -0.105,0.008 -0.158,0.025 l -9,3.001 c -0.262,0.087 -0.404,0.37 -0.316,0.632 0.087,0.262 0.368,0.404 0.632,0.316 l 9,-2.999 C 0.42,0.887 0.561,0.604 0.474,0.342 0.404,0.133 0.21,0 0,0"/></g><g transform="translate(11.0005,13.5)" id="g60"><path id="path62" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.032,0 -0.065,0.003 -0.099,0.01 l -10,2 c -0.27,0.054 -0.446,0.317 -0.392,0.588 0.054,0.271 0.313,0.449 0.589,0.392 l 10,-2 C 0.368,0.936 0.544,0.673 0.49,0.402 0.442,0.164 0.233,0 0,0"/></g><g transform="translate(31.001,22)" id="g64"><path id="path66" style="fill:#292f33;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(4.999,22)" id="g68"><path id="path70" style="fill:#292f33;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(15,5)" id="g72"><path id="path74" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -2.239,-5 -5,-5 -2.761,0 -5,2.238 -5,5 0,2.762 4,13 5,13 1,0 5,-10.238 5,-13"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 20c0 10-11 16-18 16S0 29.941 0 20C0 10.059 4 0 18 0s18 10 18 20z"/><path fill="#FFCC4D" d="M35 1c1 1 0 11 0 11L27 2s7-2 8-1zM1 1C0 2 1 12 1 12L9 2S2 0 1 1z"/><path fill="#292F33" d="M25.362 30.636C24.879 29.87 21.947 25.5 18 25.5c-4.234 0-7.3 5.028-7.428 5.243-.121.2-.085.457.084.619.094.091.219.138.344.138.096 0 .193-.027.277-.084.029-.02 2.918-1.916 6.723-1.916 3.792 0 6.695 1.897 6.723 1.916.086.058.215.096.281.084.277-.004.516-.219.516-.5 0-.144-.06-.272-.158-.364z"/><ellipse fill="#292F33" cx="12" cy="14.5" rx="2" ry="3.5"/><ellipse fill="#292F33" cx="24" cy="14.5" rx="2" ry="3.5"/><path fill="#67757F" d="M18 19.5c3 0 3 .5 3 1.5s-1.5 3-3 3-3-2-3-3-.001-1.5 3-1.5z"/><path d="M26 20.5c-.209 0-.404-.133-.475-.342-.087-.262.055-.545.316-.633l9-3c.264-.087.545.054.633.316.087.262-.055.545-.316.632l-9 3c-.053.019-.105.027-.158.027zm-1.001 2c-.233 0-.441-.164-.489-.402-.055-.271.121-.534.392-.588l10-2c.26-.054.533.12.588.392.055.271-.121.534-.393.588l-10 2c-.032.007-.065.01-.098.01zM10 20.5c-.052 0-.106-.008-.158-.025l-9-3c-.262-.087-.403-.37-.316-.632.087-.262.368-.404.632-.316l9 3c.262.088.403.371.316.633-.07.207-.264.34-.474.34zm1 2c-.032 0-.065-.003-.099-.01l-10-2c-.271-.054-.446-.317-.392-.588.054-.271.313-.449.588-.392l10 2c.271.054.446.317.392.588-.046.238-.255.402-.489.402z" fill="#9AAAB4"/><path fill="#292F33" d="M31.001 14c-.305 0-.604-.138-.801-.4-2.641-3.521-6.061-3.599-6.206-3.6-.55-.006-.994-.456-.991-1.005C23.006 8.444 23.45 8 24 8c.184 0 4.537.05 7.8 4.4.332.442.242 1.069-.2 1.4-.18.135-.39.2-.599.2zM4.999 14c-.208 0-.419-.065-.599-.2-.442-.331-.531-.958-.2-1.4C7.462 8.05 11.816 8 12 8c.552 0 1 .448 1 1 0 .551-.445.998-.996 1-.156.002-3.569.086-6.205 3.6-.195.262-.496.4-.8.4z"/><path fill="#5DADEC" d="M15 31c0 2.762-2.239 5-5 5s-5-2.238-5-5 4-13 5-13 5 10.238 5 13z"/></svg>
\ No newline at end of file