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/1f487-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f487-1f3fb-200d-2642-fe0f.svg
index 932553668..d50a42985 100644
--- a/public/emoji/1f487-1f3fb-200d-2642-fe0f.svg
+++ b/public/emoji/1f487-1f3fb-200d-2642-fe0f.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,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" 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(28.026,17.1011)" id="g20"><path id="path22" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14.849,14.849 c 0,0 -0.707,-2.121 0.707,-3.535 C -12.728,9.9 -1.414,-1.414 -1.414,-1.414 L 0,0 Z"/></g><g transform="translate(26.6118,19.9296)" id="g24"><path id="path26" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.391,0.391 1.657,-0.243 2.828,-1.414 4,-2.586 4.633,-3.852 4.243,-4.243 3.852,-4.633 2.586,-4 1.414,-2.828 0.243,-1.657 -0.391,-0.391 0,0 M 5.657,-5.657 C 6.829,-4.485 6.195,-1.952 4.243,0 2.29,1.952 -0.242,2.586 -1.414,1.414 -2.586,0.242 -1.952,-2.29 0,-4.243 1.952,-6.195 4.485,-6.829 5.657,-5.657"/></g><g transform="translate(8.8591,35.6602)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.527,0 -2.969,-0.348 -4.266,-0.954 -0.225,0.019 0.913,0.035 0.684,0.035 -4.5,0 -8.146,-3.647 -8.146,-8.147 0,-3.564 2.293,-6.586 5.482,-7.691 1.854,-2.12 3.208,-3.466 6.246,-3.466 5.584,0 10.111,4.527 10.111,10.112 C 10.111,-4.527 5.584,0 0,0"/></g><g transform="translate(-1,31)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 L 18,0 0,0 Z"/></g><g transform="translate(4,14)" id="g36"><path id="path38" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,0 8,0 C 8,0 7,-2 4,-2 1,-2 0,0 0,0"/></g><g transform="translate(4,20)" 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(12,20)" id="g44"><path id="path46" 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(9,16.5)" id="g48"><path id="path50" style="fill:#c1694f;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(0.8472,22.2848)" id="g52"><path id="path54" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.801,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.801,2.861 0,1.58 0,0"/></g><g transform="translate(18.7292,22.2848)" id="g56"><path id="path58" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.8,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.8,2.861 0,1.58 0,0"/></g><g transform="translate(17,9)" id="g60"><path id="path62" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path64" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,0 -1,0 0,4 1,0 0,-4 z"/><path id="path66" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 -1,4 0,4 0,0 Z"/><g transform="translate(5,12)" id="g68"><path id="path70" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(-1.25,25.2209)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.232,5.842 3.423,7.987 18.25,5.967 18.312,-0.075 C 11.386,-0.075 7.361,2.939 5.299,5.252 4.655,3.229 3.135,0 0,0"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(16.5897,25.2096)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 5.848,-0.553 9.91,2.509 0,0 -6.437,0.688 -12.031,5.281 C -5.567,10.62 0,0 0,0"/></g><g transform="translate(22.1434,14.2596)" id="g88"><path id="path90" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.001,21 c 0,0 2,-1 2,-3 C 1.999,15.999 2,0 2,0 L 0,0 Z"/></g><g transform="translate(22.1434,14.2596)" id="g92"><path id="path94" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.657 -0.448,-3 -1.001,-3 -1.554,-3.001 -2,-1.657 -2,0 c 0,1.657 0.447,2.999 1,3 0.552,0 0.999,-1.343 1,-3 m 2,0 c -10e-4,2.761 -1.343,4.999 -3,4.999 -1.657,0 -3.001,-2.238 -3,-5 C -4,-2.761 -2.658,-5 -1.001,-5 0.657,-5 2,-2.762 2,0"/></g><g transform="translate(22.3692,19.9296)" id="g96"><path id="path98" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.39,0.39 -0.391,1.023 0,1.414 0.391,0.391 1.024,0.391 1.414,0 C 1.805,1.024 1.805,0.391 1.414,0 1.023,-0.391 0.39,-0.39 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M28.026 18.899L13.177 4.05s-.707 2.121.707 3.536l12.728 12.728 1.414-1.415z"/><path fill="#67757F" d="M32.269 21.727c1.172-1.172.538-3.704-1.414-5.657-1.952-1.952-4.485-2.586-5.657-1.414s-.538 3.704 1.414 5.657 4.485 2.586 5.657 1.414zm-5.657-5.657c.391-.391 1.657.243 2.828 1.414 1.171 1.171 1.805 2.438 1.414 2.828s-1.657-.243-2.828-1.414c-1.171-1.171-1.805-2.437-1.414-2.828z"/><path fill="#292F33" d="M26.5 8.281s-4.42-.48-9.118-3.255C15.587 2.212 12.445.34 8.859.34c-1.515 0-2.946.344-4.237.942.125-.008.431-.015.589-.019-1.988.015-3.805.744-5.211 1.943v12.367c.766.655 1.641 1.187 2.613 1.524 1.854 2.121 3.208 3.466 6.246 3.466 5.472 0 9.917-4.349 10.094-9.779 2.074-.139 5.124-.676 7.547-2.503z"/><path fill="#4289C1" d="M17 27H0v9h21v-5c0-2.209-1.791-4-4-4z"/><path fill="#2A6797" d="M16 32h1v4h-1z"/><path fill="#F7DECE" d="M18.729 13.715c0-1.548-.769-2.801-1.729-2.852v-.011c-6.887-.019-10.896-3.02-12.951-5.326C3.497 7.259 2.3 9.869 0 10.586v10.525c1.042 2.023 2.834 3.583 5 4.353V28c0 1.657 1.343 3 3 3s3-1.343 3-3v-2.523c3.493-1.237 6-4.56 6-8.477v-.433c.96-.051 1.729-1.304 1.729-2.852z"/><path fill="#C1694F" d="M4 22h8s-1 2-4 2-4-2-4-2zm5-2.5H7c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M4 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/><path fill="#9AAAB4" d="M22.143 21.74l-.001-21s2 1 2 3l.001 18h-2z"/><circle fill="#67757F" cx="23.076" cy="15.363" r="1"/><path fill="#67757F" d="M24.143 21.74c-.001-2.762-1.342-5-3-5-1.657 0-3.001 2.239-3 5 0 2.761 1.342 5 3 4.999 1.657.002 3-2.236 3-4.999zm-2 0c0 1.657-.448 3-1.001 3-.553.001-.999-1.343-.999-3-.001-1.657.447-2.999 1-3 .553.001 1 1.344 1 3z"/></svg>
\ No newline at end of file