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/1f475-1f3fe.svg b/public/emoji/1f475-1f3fe.svg
index e9950c385..adb2c20b2 100644
--- a/public/emoji/1f475-1f3fe.svg
+++ b/public/emoji/1f475-1f3fe.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(13.062,32.0005)" id="g20"><path id="path22" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 2.211,4 4.938,4 7.666,4 9.876,2.209 9.876,0 9.876,-2.209 7.666,-4 4.938,-4 2.211,-4 0,-2.209 0,0"/></g><g transform="translate(33,15)" id="g24"><path id="path26" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.14 -1.053,3.872 -2.373,3.98 -3.745,11.445 -8.87,17 -15,17 -21.13,17 -26.255,11.445 -27.627,3.98 -28.947,3.872 -30,2.14 -30,0 c 0,-2.153 1.066,-3.896 2.399,-3.983 C -26.193,-10.946 -21.094,-15 -15,-15 c 6.094,0 11.193,4.054 12.602,11.017 C -1.066,-3.896 0,-2.153 0,0"/></g><g transform="translate(25,17)" id="g28"><path id="path30" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 L 0,2 C 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(14,17)" id="g32"><path id="path34" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(18,4.3486)" id="g36"><path id="path38" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.519,0 -3.494,0.753 -3.664,0.903 -0.413,0.367 -0.45,0.999 -0.084,1.412 0.355,0.403 0.963,0.45 1.377,0.114 C -2.311,2.39 -1.671,2 0,2 1.751,2 2.37,2.428 2.376,2.433 2.79,2.8 3.402,2.743 3.768,2.332 4.135,1.919 4.077,1.27 3.664,0.903 3.494,0.753 2.519,0 0,0"/></g><g transform="translate(19,8)" id="g40"><path id="path42" style="fill:#915a34;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(23,12)" id="g44"><path id="path46" style="fill:#60352a;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.553 -0.553,4 0,4 0.553,4 1,3.553 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(13,12)" id="g48"><path id="path50" style="fill:#60352a;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.553 -0.552,4 0,4 0.552,4 1,3.553 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(33,24.0005)" id="g52"><path id="path54" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2,7 -8,9 -11.188,9 -13,9 -15,7.999 -15,7.999 c 0,0 -2.001,1.001 -4,1.001 -3,0 -9,-2 -11,-9 -1.648,-5.769 2,-11.001 2,-11.001 0,3.002 2,9.001 7,9.001 5,0 6,3.999 6,3.999 0,0 0.786,-3.999 5.786,-3.999 5,0 7.214,-5.999 7.214,-9.001 0,0 3.648,5.232 2,11.001"/></g><g transform="translate(33,12)" id="g56"><path id="path58" style="fill:#aa8dd8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(5,12)" id="g60"><path id="path62" style="fill:#aa8dd8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.553 -0.448,1 -1,1 -0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1 0.552,0 1,0.447 1,1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#6D6E71" d="M13.062 4c0-2.209 2.211-4 4.938-4 2.728 0 4.938 1.791 4.938 4S20.728 8 18 8c-2.727-.001-4.938-1.792-4.938-4z"/><path fill="#AF7E57" d="M33 21c0-2.14-1.053-3.872-2.373-3.98C29.255 9.555 24.13 4 18 4S6.745 9.555 5.373 17.02C4.053 17.128 3 18.86 3 21c0 2.153 1.066 3.896 2.399 3.983C6.807 31.946 11.906 36 18 36c6.094 0 11.193-4.054 12.602-11.017C31.934 24.896 33 23.153 33 21z"/><path fill="#808285" d="M25 19h-3c-.553 0-1-.448-1-1s.447-1 1-1h3c.553 0 1 .448 1 1s-.447 1-1 1zm-11 0h-3c-.552 0-1-.448-1-1s.448-1 1-1h3c.552 0 1 .448 1 1s-.448 1-1 1z"/><path fill="#DF1F32" d="M18 31.651c-2.519 0-3.494-.753-3.664-.903-.413-.367-.45-.999-.083-1.412.355-.402.963-.449 1.376-.113.06.039.7.429 2.371.429 1.751 0 2.37-.428 2.376-.433.414-.367 1.026-.311 1.392.101.367.413.31 1.062-.103 1.429-.171.149-1.146.902-3.665.902z"/><path fill="#915A34" d="M19 28h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path d="M23 24c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1s1 .447 1 1v2c0 .553-.447 1-1 1zm-10 0c-.552 0-1-.447-1-1v-2c0-.553.448-1 1-1s1 .447 1 1v2c0 .553-.448 1-1 1z" fill="#60352A"/><path fill="#808285" d="M33 12c-2-7-8-9-11.188-9C20 3 18 4 18 4s-2-1-4-1c-3 0-9 2-11 9-1.648 5.769 2 11 2 11 0-3.001 2-9 7-9s6-4 6-4 .786 4 5.786 4S31 20 31 23c0 0 3.648-5.231 2-11z"/><circle fill="#AA8DD8" cx="32" cy="24" r="1"/><circle fill="#AA8DD8" cx="4" cy="24" r="1"/></svg>
\ No newline at end of file