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/1f472-1f3ff.svg b/public/emoji/1f472-1f3ff.svg
index 122e20c2b..e1ae612f9 100644
--- a/public/emoji/1f472-1f3ff.svg
+++ b/public/emoji/1f472-1f3ff.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(30.5,22.0005)" id="g20"><path id="path22" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.428,0 -0.824,-0.188 -1.177,-0.491 -2.81,5.54 -7.256,9.875 -12.5,9.875 -17.744,9.875 -22.191,5.54 -23.824,-0.491 -24.176,-0.188 -24.572,0 -25,0 c -1.381,0 -2.5,-1.791 -2.5,-4.001 0,-2.209 1.119,-4 2.5,-4 0.225,0 0.438,0.063 0.646,0.152 0.86,-7.439 5.832,-13.152 11.854,-13.152 6.021,0 10.993,5.713 11.855,13.153 0.207,-0.09 0.42,-0.153 0.645,-0.153 1.381,0 2.5,1.791 2.5,4 C 2.5,-1.791 1.381,0 0,0"/></g><g transform="translate(6,23.8896)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,5.055 4.958,11.111 12,11.111 19.041,11.111 24,5.055 24,0 24,-0.723 19.041,-2.889 12,-2.889 4.958,-2.889 0,-0.723 0,0"/></g><g transform="translate(18,5)" id="g28"><path id="path30" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.21,0 -4.357,1.061 -4.447,1.105 -4.94,1.352 -5.14,1.951 -4.895,2.445 -4.649,2.94 -4.05,3.14 -3.554,2.896 -3.536,2.886 -1.73,2 0,2 1.73,2 3.536,2.886 3.554,2.896 4.052,3.139 4.649,2.939 4.895,2.445 5.141,1.951 4.94,1.352 4.447,1.105 4.356,1.061 2.211,0 0,0"/></g><g transform="translate(19,10)" id="g32"><path id="path34" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(18,35)" id="g36"><path id="path38" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 5,-4 6,-8 0.97,-3.88 0,-7 0,-7 l -12,0 c 0,0 -1,2.999 0,7 1,4 6,8 6,8"/></g><g transform="translate(6,25.0005)" id="g40"><path id="path42" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3,-3 12,-3 9,0 12,3 12,3 0,0 1,-2 0,-3 -1,-1 -4,-3 -12,-3 -8,0 -11,2 -12,3 -1,1 0,3 0,3"/></g><g transform="translate(16,35.0005)" id="g44"><path id="path46" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.896,1 2,1 3.105,1 4,0.552 4,0 4,-0.552 3.105,-1 2,-1 0.896,-1 0,-0.552 0,0"/></g><g transform="translate(15,25.0005)" id="g48"><path id="path50" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.104 1.343,2 3,2 4.657,2 6,1.104 6,0 6,-1.105 4.657,-2 3,-2 1.343,-2 0,-1.105 0,0"/></g><g transform="translate(13,14)" id="g52"><path id="path54" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -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.447 0.552,0 0,0"/></g><g transform="translate(23,14)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.553,4 0,4 0.553,4 1,3.552 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M30.5 14c-.428 0-.824.188-1.177.491C27.69 8.459 23.244 4.125 18 4.125S8.309 8.46 6.676 14.49C6.324 14.188 5.928 14 5.5 14 4.119 14 3 15.79 3 18c0 2.209 1.119 4 2.5 4 .225 0 .438-.062.646-.151C7.006 29.287 11.978 35 18 35c6.021 0 10.993-5.713 11.854-13.152.208.09.421.152.646.152 1.381 0 2.5-1.791 2.5-4 0-2.21-1.119-4-2.5-4z"/><path fill="#DD2E44" d="M6 12.11C6 7.055 10.958 1 18 1c7.041 0 12 6.056 12 11.111C30 12.833 25.041 15 18 15c-7.042 0-12-2.167-12-2.89z"/><path fill="#3D2E24" d="M18 31c-2.21 0-4.357-1.06-4.447-1.105-.493-.247-.693-.846-.447-1.34.245-.495.844-.694 1.34-.45.018.009 1.824.895 3.554.895 1.73 0 3.536-.886 3.554-.896.498-.243 1.096-.044 1.341.45.246.494.046 1.093-.447 1.34C22.356 29.94 20.211 31 18 31zm1-5h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#77B255" d="M18 1s5 4 6 8c.97 3.88 0 7 0 7H12s-1-3 0-7 6-8 6-8z"/><path fill="#414042" d="M6 11s3 3 12 3 12-3 12-3 1 2 0 3-4 3-12 3-11-2-12-3 0-3 0-3z"/><ellipse fill="#414042" cx="18" cy="1" rx="2" ry="1"/><ellipse fill="#FFD983" cx="18" cy="11" rx="3" ry="2"/><path d="M13 22c-.552 0-1-.447-1-1v-2c0-.552.448-1 1-1s1 .448 1 1v2c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2c0 .553-.447 1-1 1z"/></svg>
\ No newline at end of file