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/1f470.svg b/public/emoji/1f470.svg
index 3445fc8d6..e68b5345b 100644
--- a/public/emoji/1f470.svg
+++ b/public/emoji/1f470.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(35,18.0005)" id="g20"><path id="path22" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,7.002 -2,13 -7,16 -5,3 -10,0.784 -10,0.784 l 0,-0.035 -0.001,0.035 c 0,0 -4.999,2.216 -9.999,-0.784 -5,-3 -7,-8.998 -7,-16 0,-7.003 -1,-18.001 -1,-18.001 l 18,0 18,0 C 1,-18.001 0,-7.003 0,0"/></g><g transform="translate(17.999,33.1909)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.876,0 13.001,-2.438 13.001,-13.001 0,-10.564 0,-13.001 -2.438,-13.001 -2.437,0 -5.687,2.437 -10.563,2.437 -4.876,0 -8.056,-2.437 -10.563,-2.437 -2.716,0 -2.438,9.751 -2.438,13.001 C -13.001,-2.438 -4.876,0 0,0"/></g><g transform="translate(32,0)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-1 28,0 z"/></g><g transform="translate(27.75,20.5454)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,6.928 -4.366,12.544 -9.751,12.544 -5.385,0 -9.75,-5.616 -9.75,-12.544 0,-5.581 2.834,-10.305 6.751,-11.934 l 0,-1.611 -3,0 0,-5 12,0 0,5 -3,0 0,1.613 C -2.834,-10.303 0,-5.58 0,0"/></g><g transform="translate(5.8633,16)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.025,0 -0.052,0.59 -0.052,0.876 0,4.063 2.437,-0.425 2.437,2.47 0,2.895 1.625,3.266 3.25,4.891 0.813,0.812 2.438,2.446 2.438,2.446 0,0 4.063,-2.434 7.314,-2.434 3.25,0 6.5,-1.624 6.5,-4.874 0,-3.25 2.437,1.563 2.437,-2.5 C 24.324,0.586 24.297,0 24.277,0 l 0.853,0 c 0.007,1 0.007,2.608 0.007,4.126 0,10.563 -8.125,14.658 -13.001,14.658 C 7.26,18.784 -0.865,14.674 -0.865,4.11 -0.865,3.169 -0.888,2 -0.855,0 L 0,0 Z"/></g><g transform="translate(14,18)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(22,18)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(27.6475,30.0396)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.477,0.564 -0.982,1.079 -1.516,1.535 -2.957,1.196 -6.052,0.961 -9.648,0.961 c -3.591,0 -6.682,0.234 -8.125,0.572 -0.535,-0.456 -1.04,-0.971 -1.517,-1.534 1.871,-0.619 5.487,-1.038 9.642,-1.038 4.16,0 7.778,0.42 9.648,1.039"/></g><g transform="translate(19,15.5)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 l -1,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5 l 1,0 C -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(17.9951,12.2187)" id="g56"><path id="path58" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.13,0 1.817,0.469 2.349,0.812 2.88,1.156 3.817,0.523 3.005,-0.176 2.192,-0.875 0.952,-1.154 0.004,-1.154 L 0,0 Z"/></g><g transform="translate(17.9951,12.2187)" id="g60"><path id="path62" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.13,0 -1.817,0.469 -2.349,0.812 -0.531,0.344 -1.468,-0.289 -0.656,-0.988 0.813,-0.699 2.053,-0.978 3.001,-0.978 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E6E7E8" d="M35 18c0-7.002-2-13-7-16s-10-.784-10-.784v.034l-.001-.034S13-1 8 2s-7 8.998-7 16c0 7.003-1 18-1 18h36s-1-10.998-1-18z"/><path fill="#FFAC33" d="M17.999 2.809C22.875 2.809 31 5.247 31 15.81c0 10.564 0 13.001-2.438 13.001s-5.688-2.438-10.563-2.438c-4.876 0-8.056 2.438-10.563 2.438-2.716 0-2.438-9.751-2.438-13.001 0-10.563 8.125-13.001 13.001-13.001z"/><path fill="#FFF" d="M32 36v-1c0-3.313-2.687-6-6-6H10c-3.313 0-6 2.687-6 6v1h28z"/><path fill="#FFDC5D" d="M27.75 15.455c0-6.928-4.366-12.544-9.751-12.544s-9.75 5.616-9.75 12.544c0 5.581 2.835 10.305 6.751 11.934V29h-3v5h12v-5h-3v-1.613c3.916-1.629 6.75-6.353 6.75-11.932z"/><path fill="#FFAC33" d="M5.863 20c-.025 0-.052-.59-.052-.876 0-4.063 2.438.425 2.438-2.47s1.625-3.266 3.25-4.891c.812-.812 2.438-2.446 2.438-2.446s4.063 2.434 7.314 2.434c3.25 0 6.5 1.624 6.5 4.874s2.438-1.563 2.438 2.5c0 .289-.027.875-.047.875h.853C31 19 31 17.392 31 15.874 31 5.311 22.875 1.216 17.999 1.216c-4.876 0-13.001 4.11-13.001 14.674 0 .942-.023 2.11.01 4.11h.855z"/><path fill="#662113" d="M14 18c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#FFF" d="M27.647 5.96c-.477-.564-.981-1.079-1.516-1.535C24.69 4.765 21.596 5 18 5c-3.591 0-6.682-.234-8.126-.572-.534.456-1.04.97-1.516 1.534C10.229 6.58 13.844 7 18 7c4.159 0 7.777-.42 9.647-1.04z"/><path fill="#C1694F" d="M19 20.5c0 .276-.224.5-.5.5h-1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5z"/><path fill="#DF1F32" d="M17.995 23.781c1.13 0 1.817-.469 2.349-.812.531-.344 1.469.289.656.988-.812.699-2.053.978-3.001.978l-.004-1.154z"/><path fill="#DF1F32" d="M17.995 23.781c-1.13 0-1.817-.469-2.349-.812-.531-.344-1.469.289-.656.988.812.699 2.053.978 3.001.978l.004-1.154z"/></svg>
\ No newline at end of file