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/1f4bb.svg b/public/emoji/1f4bb.svg
index e995d4856..93357fa23 100644
--- a/public/emoji/1f4bb.svg
+++ b/public/emoji/1f4bb.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 4,8.912 C 2.895,8.912 2.333,7.908 2,6.904 l 0,0 L 0,2.009 C 0,0.899 0.895,0 2,0 l 0,0 32,0 c 1.105,0 2,0.899 2,2.009 l 0,0 -2,4.895 c -0.417,0.963 -0.895,2.008 -2,2.008 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" 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(33,10.9205)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.109 -0.895,-2.008 -2,-2.008 l -26,0 c -1.104,0 -2,0.899 -2,2.008 l 0,17.071 c 0,1.109 0.896,2.008 2,2.008 l 26,0 c 1.105,0 2,-0.899 2,-2.008 L 0,0 Z"/></g><g transform="translate(36,2.0084)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.109 -0.895,-2.008 -2,-2.008 l -32,0 c -1.104,0 -2,0.899 -2,2.008 l 2,4.895 c 0.333,1.005 0.896,2.009 2,2.009 l 28,0 c 1.105,0 1.583,-1.046 2,-2.009 L 0,0 Z"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(38,1.925)" id="g36"><path id="path38" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -38,0 1,-4.059 37,0 L 0,0 Z"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(31,11.9247)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.555 -0.447,-1.004 -1,-1.004 l -24,0 c -0.552,0 -1,0.449 -1,1.004 l 0,15.063 c 0,0.554 0.448,1.004 1,1.004 l 24,0 c 0.553,0 1,-0.45 1,-1.004 L 0,0 Z"/></g><g transform="translate(32.9063,4.9582)" id="g52"><path id="path54" style="fill:#aebbc1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.76,2.175 c -0.239,0.46 -0.635,0.838 -1.187,0.838 l -25.849,0 c -0.552,0 -0.906,-0.408 -1.156,-1.036 L -29.64,0 c -0.218,-0.596 0.448,-1.004 1,-1.004 l 7.578,0 c 0,0 0.937,0.047 1.103,0.608 0.192,0.648 0.415,1.624 0.463,1.795 0.074,0.264 0.388,0.531 0.856,0.531 l 8.577,0 c 0.5,0 0.747,-0.253 0.811,-0.566 0.042,-0.204 0.313,-1.141 0.438,-1.782 0.111,-0.57 1.22,-0.586 1.22,-0.586 l 6.594,0 c 0.553,0 1.219,0.471 1,1.004"/></g><g transform="translate(22.375,2.887)" id="g56"><path id="path58" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.781,0 c -0.375,0 -0.538,0.343 -0.485,0.675 0.054,0.331 0.36,1.792 0.383,1.963 0.024,0.171 0.275,0.375 0.524,0.375 l 7.015,0 c 0.297,0 0.49,-0.163 0.55,-0.49 C 0.266,2.197 0.508,0.883 0.527,0.583 0.547,0.282 0.359,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M34 29.096c-.417-.963-.896-2.008-2-2.008h-1c1.104 0 2-.899 2-2.008V8.008C33 6.899 32.104 6 31 6H5c-1.104 0-2 .899-2 2.008V25.08c0 1.109.896 2.008 2 2.008H4c-1.104 0-1.667 1.004-2 2.008l-2 4.895C0 35.101.896 36 2 36h32c1.104 0 2-.899 2-2.008l-2-4.896z"/><path fill="#9AAAB4" d="M.008 34.075l.006.057.17.692C.5 35.516 1.192 36 2 36h32c1.076 0 1.947-.855 1.992-1.925H.008z"/><path fill="#5DADEC" d="M31 24.075c0 .555-.447 1.004-1 1.004H6c-.552 0-1-.449-1-1.004V9.013c0-.555.448-1.004 1-1.004h24c.553 0 1 .45 1 1.004v15.062z"/><path fill="#AEBBC1" d="M32.906 31.042l-.76-2.175c-.239-.46-.635-.837-1.188-.837H5.11c-.552 0-.906.408-1.156 1.036l-.688 1.977c-.219.596.448 1.004 1 1.004h7.578s.937-.047 1.103-.608c.192-.648.415-1.624.463-1.796.074-.264.388-.531.856-.531h8.578c.5 0 .746.253.811.566.042.204.312 1.141.438 1.782.111.571 1.221.586 1.221.586h6.594c.551 0 1.217-.471.998-1.004z"/><path fill="#9AAAB4" d="M22.375 33.113h-7.781c-.375 0-.538-.343-.484-.675.054-.331.359-1.793.383-1.963.023-.171.274-.375.524-.375h7.015c.297 0 .49.163.55.489.059.327.302 1.641.321 1.941.019.301-.169.583-.528.583z"/></svg>
\ No newline at end of file