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/1f6b6.svg b/public/emoji/1f6b6.svg
index db08fa81e..c82bdf756 100644
--- a/public/emoji/1f6b6.svg
+++ b/public/emoji/1f6b6.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(15.0119,32.7458)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.207,-0.267 1.054,-1.529 0.684,-2.739 -0.252,-0.838 0.225,0 1,0 0,0 0.627,-1.283 0.423,-3.226 C 1.9,-7.905 4.579,-8.581 4.784,-6.638 4.988,-4.697 3.399,-3.65 4.273,-2.138 6.365,1.481 0,0 0,0"/></g><g transform="translate(20.5673,30.0254)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.929,1.996 0.212,4.298 -1.602,5.143 -1.814,0.845 -4.77,0.077 -5.239,-2.073 -0.465,-2.136 -0.029,-5.389 1.877,-5.3 0.527,0.025 1.058,0.067 1.572,0.149 0.067,-0.251 0.052,-0.762 -0.043,-1.247 -0.369,-1.864 2.171,-2.75 2.538,-0.883 0.214,1.093 -0.194,1.941 -0.373,2.737 C -0.753,-1.13 -0.31,-0.665 0,0"/></g><g transform="translate(21.043,34.2896)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.149,1.524 -2.815,2.229 -5.8,1.279 -2.607,-0.829 -1.787,-3.075 -1.296,-2.593 0.782,0.767 1.757,0.458 1.757,0.458 l 0.632,-2.315 c 0,0 0.353,-0.242 0.552,0.52 0.2,0.762 1.239,0.778 1.541,0.137 0.469,-0.995 -0.233,-1.138 -0.331,-1.711 -0.309,-1.81 1.713,-1.863 1.713,-1.863 0,0 0.383,-0.179 1.136,1.103 C 0.656,-3.703 1.141,-1.513 0,0"/></g><g transform="translate(23.696,15.0065)" id="g32"><path id="path34" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 0,4.52 -4.661,9.247 -4.708,9.294 -0.389,0.391 -0.389,1.024 0.002,1.414 0.391,0.39 1.023,0.389 1.413,0 C -4.077,11.491 1,6.352 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(15.696,1.0065)" id="g36"><path id="path38" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.105,0 -2,0.896 -2,2 l 0,7 c 0,0.348 0.091,0.69 0.264,0.992 l 4,7 c 0.547,0.959 1.77,1.294 2.728,0.744 0.959,-0.547 1.292,-1.769 0.744,-2.728 L 2,8.469 2,2 C 2,0.896 1.104,0 0,0"/></g><g transform="translate(24.697,4.0065)" id="g40"><path id="path42" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.587,0 -1.168,0.257 -1.562,0.751 l -4,5 C -5.763,6 -5.899,6.294 -5.962,6.607 l -1,5 c -0.217,1.083 0.485,2.138 1.568,2.354 1.088,0.219 2.138,-0.486 2.354,-1.568 L -2.135,7.869 1.561,3.249 C 2.251,2.387 2.111,1.128 1.248,0.438 0.88,0.144 0.439,0 0,0"/></g><g transform="translate(22.696,17.0065)" id="g44"><path id="path46" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-1 -2,-1 l -4,0 c -2,6 -0.359,12 2,12 3,0 3,-4 4,-9"/></g><g transform="translate(17.696,24.0094)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.001,-0.045 -0.066,-4.552 -3.6,-7.203 l 0.01,-0.014 C -3.833,-7.399 -4,-7.676 -4,-8.003 c 0,-0.553 0.448,-1 1,-1 0.225,0 0.423,0.088 0.59,0.214 L -2.4,-8.803 C 1.95,-5.54 2,-0.227 2,-0.003 L 0,0 Z"/></g><g transform="translate(27.8778,4.9515)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.271,0.271 0.16,0.676 -0.129,0.94 -0.592,1.363 -0.802,1.514 -0.802,1.514 -1.057,1.682 -1.675,1.931 -1.932,1.675 -3.805,-0.19 -5.236,-2.856 -5.288,-3.785 -5.319,-4.333 -4.643,-4.64 -4.259,-4.256 -3.126,-3.123 -0.982,-0.981 0,0"/></g><g transform="translate(17.6118,0.0966)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.383,-0.003 0.594,0.361 0.578,0.753 0.554,1.379 0.514,1.634 0.514,1.634 0.455,1.934 0.199,2.549 -0.165,2.552 -2.807,2.575 -5.711,1.721 -6.408,1.106 -6.82,0.742 -6.564,0.046 -6.021,0.042 -4.418,0.032 -1.388,0.01 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M15.012 3.254c-1.207.267 1.054 1.529.684 2.739-.252.838.225 0 1 0 0 0 .627 1.283.423 3.226-.207 1.94 2.472 2.616 2.677.673.204-1.941-1.385-2.988-.511-4.5 2.092-3.619-4.273-2.138-4.273-2.138"/><path fill="#FFDC5D" d="M20.567 5.975c.929-1.996.212-4.298-1.602-5.143-1.814-.845-4.769-.077-5.238 2.073-.466 2.136-.03 5.389 1.877 5.299.527-.025 1.057-.067 1.571-.149.067.25.052.761-.043 1.246-.369 1.864 2.171 2.751 2.539.883.214-1.093-.195-1.942-.373-2.737.516-.343.96-.808 1.269-1.472z"/><path fill="#FFAC33" d="M21.043 1.71C19.894.186 18.228-.519 15.243.431c-2.607.829-1.788 3.076-1.297 2.594.782-.768 1.757-.458 1.757-.458l.632 2.315s.353.242.553-.52c.199-.762 1.239-.778 1.541-.137.469.996-.233 1.139-.331 1.711-.31 1.81 1.713 1.864 1.713 1.864s.383.178 1.135-1.103c.753-1.283 1.238-3.473.097-4.987z"/><path fill="#F9CA55" d="M23.696 20.993c-.553 0-1-.447-1-1 0-4.52-4.661-9.247-4.707-9.294-.39-.391-.389-1.024.001-1.414.391-.39 1.023-.389 1.413.001.216.216 5.293 5.355 5.293 10.708 0 .552-.447.999-1 .999z"/><path fill="#2A6797" d="M15.696 34.993c-1.104 0-2-.896-2-2v-7c0-.348.091-.69.264-.992l4-7c.548-.958 1.771-1.293 2.729-.744.959.548 1.292 1.77.744 2.729l-3.736 6.539v6.469c-.001 1.104-.897 1.999-2.001 1.999z"/><path fill="#4289C1" d="M24.697 31.993c-.587 0-1.168-.257-1.562-.751l-4-5c-.2-.249-.337-.543-.399-.856l-1-5c-.217-1.083.485-2.137 1.568-2.354 1.088-.219 2.138.486 2.354 1.568l.905 4.524 3.695 4.62c.691.862.551 2.121-.312 2.811-.369.295-.811.438-1.249.438z"/><path fill="#77B255" d="M22.696 18.993s0 1-2 1h-4c-2-6-.359-12 2-12 3 0 3 4 4 9"/><path fill="#FFDC5D" d="M17.696 11.991c0 .045-.066 4.552-3.6 7.203l.01.014c-.243.183-.41.459-.41.786 0 .553.448 1 1 1 .225 0 .423-.088.59-.214l.01.014c4.35-3.262 4.4-8.575 4.4-8.8l-2-.003z"/><path fill="#292F33" d="M27.878 31.049c.271-.271.16-.676-.129-.94-.463-.422-.672-.574-.672-.574-.255-.168-.873-.418-1.13-.161-1.872 1.865-3.304 4.53-3.356 5.459-.031.548.645.855 1.029.471 1.132-1.133 3.276-3.275 4.258-4.255zm-10.266 4.854c.383.003.594-.361.578-.753-.025-.626-.064-.882-.064-.882-.059-.3-.316-.915-.68-.918-2.642-.023-5.545.83-6.243 1.446-.412.363-.156 1.06.388 1.063 1.603.013 4.633.034 6.021.044z"/></svg>
\ No newline at end of file