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/1f468-200d-2764-fe0f-200d-1f468.svg b/public/emoji/1f468-200d-2764-fe0f-200d-1f468.svg
index 42220fc2e..c683290ee 100644
--- a/public/emoji/1f468-200d-2764-fe0f-200d-1f468.svg
+++ b/public/emoji/1f468-200d-2764-fe0f-200d-1f468.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(25,24.1558)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.297,0.669 3.315,3.565 3.734,5.369 4.687,3.892 6.77,1.689 11,0.564 l 0,10.855 c -0.955,0.271 -1.959,0.425 -3,0.425 -6.075,0 -11,-4.925 -11,-11 0,-3.009 1.211,-5.733 3.168,-7.719 C 0.061,-6.318 0,-5.744 0,-5.156 L 0,0 Z"/></g><g transform="translate(30,20)" id="g24"><path id="path26" style="fill:#ffdc5d;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 m 3,-2.5 2,0 C 5.276,-2.5 5.5,-2.724 5.5,-3 5.5,-3.276 5.276,-3.5 5,-3.5 l -2,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5 M 4,-6 6,-6 6,4.72 C 1.77,5.845 -0.313,8.048 -1.266,9.524 -1.685,7.721 -2.703,4.825 -5,4.156 L -5,-1 c 0,-0.589 0.061,-1.162 0.168,-1.719 C -4.222,-5.87 -1.968,-8.426 1,-9.477 L 1,-11 l 3,-5 2,3.396 0,4.967 C 5.462,-7.849 4.809,-8 4,-8 1,-8 0,-6 0,-6 l 1,0 3,0 z"/></g><g transform="translate(36,7.3959)" id="g28"><path id="path30" style="fill:#3b94d9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,-3.396 -3,5 -2,0 -4,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 15,0 L 0,0 Z"/></g><path id="path32" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,0 1,0 0,4 -1,0 0,-4 z"/><g transform="translate(31,14)" id="g34"><path id="path36" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 c 0,0 1,-2 4,-2 0.809,0 1.462,0.151 2,0.363 L 5,0 3,0 0,0 Z"/></g><g transform="translate(30,20)" id="g38"><path id="path40" 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 1,2 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(33,16.5)" id="g42"><path id="path44" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,0 C 2.276,0 2.5,0.224 2.5,0.5 2.5,0.776 2.276,1 2,1 L 0,1 C -0.276,1 -0.5,0.776 -0.5,0.5 -0.5,0.224 -0.276,0 0,0"/></g><g transform="translate(11,24.1558)" id="g46"><path id="path48" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.297,0.669 -3.315,3.565 -3.734,5.369 -4.687,3.892 -6.77,1.689 -11,0.564 l 0,10.855 c 0.955,0.271 1.959,0.425 3,0.425 6.075,0 11,-4.925 11,-11 C 3,-2.165 1.789,-4.889 -0.168,-6.875 -0.061,-6.318 0,-5.744 0,-5.156 L 0,0 Z"/></g><g transform="translate(5,21)" id="g50"><path id="path52" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1.552 0.447,2 1,2 1.553,2 2,1.552 2,1 L 2,0 C 2,-0.552 1.553,-1 1,-1 0.447,-1 0,-0.552 0,0 m -1.5,-4 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 l -2,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 2,0 c 0.276,0 0.5,-0.224 0.5,-0.5 M 0,-7 1,-7 c 0,0 -1,-2 -4,-2 -0.809,0 -1.462,0.151 -2,0.363 l 0,-4.967 2,-3.396 3,5 0,1.523 C 2.968,-9.426 5.222,-6.87 5.832,-3.719 5.939,-3.162 6,-2.589 6,-2 L 6,3.156 C 3.703,3.825 2.685,6.721 2.266,8.524 1.313,7.048 -0.77,4.845 -5,3.72 L -5,-7 l 2,0 3,0 z"/></g><g transform="translate(0,7.3959)" id="g54"><path id="path56" style="fill:#3b94d9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2,-3.396 3,5 2,0 4,0 c 2.209,0 4,-1.791 4,-4 l 0,-5 -15,0 L 0,0 Z"/></g><g transform="translate(11,4)" id="g58"><path id="path60" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 -1,0 0,4 1,0 z"/></g><g transform="translate(5,14)" id="g62"><path id="path64" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1,0 c 0,0 -1,-2 -4,-2 -0.809,0 -1.462,0.151 -2,0.363 L -5,0 -3,0 0,0 Z"/></g><g transform="translate(6,20)" id="g66"><path id="path68" 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(3,16.5)" id="g70"><path id="path72" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(26.5385,31.2891)" id="g74"><path id="path76" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.601 -2.109,4.711 -4.711,4.711 -1.579,0 -2.972,-0.78 -3.828,-1.972 -0.855,1.192 -2.249,1.972 -3.827,1.972 -2.602,0 -4.711,-2.11 -4.711,-4.711 0,-0.369 0.047,-0.727 0.127,-1.07 0.654,-4.065 5.173,-8.353 8.411,-9.53 3.238,1.177 7.758,5.465 8.412,9.529 C -0.047,-0.727 0,-0.369 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M25 11.844c2.297-.669 3.315-3.565 3.734-5.369.953 1.477 3.036 3.68 7.266 4.805V.425C35.045.154 34.041 0 33 0c-6.075 0-11 4.925-11 11 0 3.009 1.211 5.733 3.168 7.719C25.061 18.162 25 17.589 25 17v-5.156z"/><path fill="#FFDC5D" d="M34 22h2V11.28c-4.23-1.125-6.313-3.328-7.266-4.804-.42 1.804-1.438 4.699-3.734 5.369V17c0 .589.061 1.162.168 1.719.61 3.15 2.863 5.706 5.832 6.757V27l3 5 2-3.396v-4.967c-.538.212-1.191.363-2 .363-3 0-4-2-4-2h4zm-1-3.5h2c.276 0 .5.224.5.5s-.224.5-.5.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5zM30 16c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#3B94D9" d="M36 28.604L34 32l-3-5h-6c-2.209 0-4 1.791-4 4v5h15v-7.396z"/><path fill="#1C6399" d="M25 32h1v4h-1z"/><path fill="#BF6952" d="M31 22h-1s1 2 4 2c.809 0 1.462-.151 2-.363V22h-5z"/><path fill="#662113" d="M30 16c.553 0 1-.448 1-1v-1c0-.552-.447-1-1-1s-1 .448-1 1v1c0 .552.447 1 1 1z"/><path fill="#BF6952" d="M33 19.5h2c.276 0 .5-.224.5-.5s-.224-.5-.5-.5h-2c-.276 0-.5.224-.5.5s.224.5.5.5z"/><path fill="#FFAC33" d="M11 11.844c-2.297-.669-3.315-3.565-3.734-5.369C6.313 7.952 4.23 10.155 0 11.28V.425C.955.154 1.959 0 3 0c6.075 0 11 4.925 11 11 0 3.009-1.211 5.733-3.168 7.719.107-.557.168-1.13.168-1.719v-5.156z"/><path fill="#FFDC5D" d="M5 22h1s-1 2-4 2c-.809 0-1.462-.151-2-.363v4.967L2 32l3-5v-1.523c2.968-1.051 5.222-3.607 5.832-6.757.107-.558.168-1.131.168-1.72v-5.156c-2.297-.669-3.315-3.565-3.734-5.369C6.313 7.952 4.23 10.155 0 11.28V22h5zm-1.5-3c0 .276-.224.5-.5.5H1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5zM5 15v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1s-1-.448-1-1z"/><path fill="#3B94D9" d="M0 28.604L2 32l3-5h6c2.209 0 4 1.791 4 4v5H0v-7.396z"/><path fill="#1C6399" d="M10 32h1v4h-1z"/><path fill="#BF6952" d="M5 22h1s-1 2-4 2c-.809 0-1.462-.151-2-.363V22h5z"/><path fill="#662113" d="M6 16c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#BF6952" d="M3 19.5H1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#E75A70" d="M26.539 4.711c0-2.602-2.11-4.711-4.711-4.711C20.249 0 18.855.78 18 1.972 17.144.78 15.751 0 14.172 0c-2.601 0-4.711 2.109-4.711 4.711 0 .369.047.727.127 1.07.654 4.065 5.173 8.353 8.411 9.529 3.238-1.177 7.758-5.465 8.412-9.528.081-.344.128-.702.128-1.071z"/></svg>
\ No newline at end of file