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/1f1f0-1f1ed.svg b/public/emoji/1f1f0-1f1ed.svg
index 7ef576703..54f6e9047 100644
--- a/public/emoji/1f1f0-1f1ed.svg
+++ b/public/emoji/1f1f0-1f1ed.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(36,9)" id="g20"><path id="path22" style="fill:#032ea1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><path id="path24" style="fill:#e01e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,10.572 -36,0 0,14.855 36,0 0,-14.855 z"/><g transform="translate(27.0215,13.1025)" id="g26"><path id="path28" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.902 -0.542,0 0,0.902 -0.496,0 0,0.586 -0.226,0 0,0.451 -0.438,0 -0.238,0.341 0,1.598 0.27,0.271 0,1.489 -0.225,-0.203 0,0.474 -0.181,0 0,-0.226 -0.36,0 0,0.722 -0.428,-0.384 0.135,0.485 -0.249,1.117 -0.135,0 c 0,0 -0.112,0.473 -0.337,0.473 0,0 0.09,0.293 -0.091,0.293 -0.181,0 -0.136,-0.225 -0.136,-0.225 0,0 -0.315,-0.136 -0.315,-0.474 l -0.18,0.022 -0.271,-1.307 0.19,-0.384 -0.439,0.384 0,-0.677 0,-0.316 -1.487,0 -0.902,0 0,0.902 -0.136,-0.134 0,-0.317 -0.315,0 0,0.317 0.225,0.202 0,0.428 -0.181,-0.191 -0.271,0.372 0,0.316 -0.157,-0.157 -0.046,0.27 0.226,0.36 -0.034,0.293 -0.259,-0.315 0,0.27 0.113,0.248 -0.519,1.308 -0.124,0.362 -0.192,0.022 0,0.181 c 0,0 -0.135,0.315 -0.316,0.315 -0.18,0 -0.315,-0.315 -0.315,-0.315 l 0,-0.181 -0.192,-0.022 -0.125,-0.362 -0.518,-1.308 0.113,-0.248 0,-0.27 -0.259,0.315 -0.035,-0.293 0.226,-0.36 -0.045,-0.27 -0.158,0.157 0,-0.316 -0.27,-0.372 -0.181,0.191 0,-0.428 0.225,-0.202 0,-0.317 -0.315,0 0,0.317 -0.136,0.134 0,-0.902 -0.902,0 -1.488,0 0,0.316 0,0.677 -0.439,-0.384 0.191,0.384 -0.271,1.307 -0.181,-0.022 c 0,0.338 -0.315,0.474 -0.315,0.474 0,0 0.045,0.225 -0.136,0.225 -0.18,0 -0.09,-0.293 -0.09,-0.293 -0.225,0 -0.338,-0.473 -0.338,-0.473 l -0.135,0 -0.248,-1.117 0.135,-0.485 -0.428,0.384 0,-0.722 -0.361,0 0,0.226 -0.181,0 0,-0.474 -0.224,0.203 0,-1.489 0.27,-0.271 0,-1.598 -0.239,-0.341 -0.348,0 0,-0.451 -0.315,0 0,-0.586 -0.452,0 0,-0.902 -0.496,0 0,-0.902 -0.496,0 -0.045,-0.991 19.035,0 L 0.496,0 0,0 Z"/></g><path id="path30" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17.458,12.111 -0.354,0 0,6.02 0.354,0 0,-6.02 z"/><path id="path32" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.912,12.111 -0.349,0 0,6.02 0.349,0 0,-6.02 z"/><path id="path34" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11.938,12.111 -0.342,0 0,6.02 0.342,0 0,-6.02 z"/><path id="path36" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13.413,12.121 -0.33,0 0,6.02 0.33,0 0,-6.02 z"/><path id="path38" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22.937,12.111 -0.427,0 0,6.02 0.427,0 0,-6.02 z"/><path id="path40" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24.413,12.111 -0.338,0 0,6.02 0.338,0 0,-6.02 z"/><g transform="translate(11.5957,16.0176)" id="g42"><path id="path44" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.006,0 -0.812,0.379 0,0.379 0,0 Z"/></g><g transform="translate(25.3271,16.0176)" id="g46"><path id="path48" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.252,0 0,0.379 1.074,0 L 0,0 Z"/></g><path id="path50" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17.329,16.018 -4.16,0 0,0.379 4.16,0 0,-0.379 z"/><path id="path52" style="fill:#db7f86;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22.849,16.018 -4.161,0 0,0.379 4.161,0 0,-0.379 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#032EA1" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#E01E24" d="M0 10.572h36v14.855H0z"/><path fill="#FFF" d="M27.021 22.897v-.902h-.542v-.901h-.496v-.586h-.226v-.451h-.438l-.238-.341v-1.599l.271-.271v-1.488l-.226.203v-.474h-.181v.226h-.359v-.723l-.429.384.136-.485-.249-1.116h-.136s-.111-.474-.337-.474c0 0 .09-.292-.091-.292s-.136.225-.136.225-.315.136-.315.473l-.18-.022-.271 1.307.191.384-.44-.384v.993H19.94v-.902l-.136.135v.316h-.315v-.316l.226-.203v-.428l-.182.191-.271-.372v-.316l-.157.157-.046-.27.226-.36-.034-.293-.258.315v-.27l.113-.248-.519-1.309-.124-.362-.191-.022v-.181s-.136-.315-.316-.315-.315.315-.315.315v.181l-.191.022-.125.362-.518 1.309.113.248v.27l-.259-.315-.035.293.226.36-.044.27-.158-.157v.316l-.27.372-.181-.191v.428l.226.203v.316h-.315v-.316l-.136-.135v.902H13.58v-.993l-.44.384.191-.384-.271-1.307-.181.022c0-.337-.315-.473-.315-.473s.045-.225-.136-.225c-.18 0-.09.292-.09.292-.226 0-.338.474-.338.474h-.135l-.248 1.116.135.485-.428-.384v.722h-.361v-.226h-.181v.474l-.225-.203v1.488l.27.271v1.599l-.239.341h-.348v.451h-.314v.586h-.452v.901h-.495v.902h-.497l-.045.991h19.035l.045-.991h-.496z"/><path fill="#DB7F86" d="M11.596 17.869v1.735h-.813l-.194.378h1.007v3.907h.342v-6.02zm13.731 2.113l-.178-.378h-.736v-1.735h-.338v6.02h.338v-3.907zm-8.222-2.113v1.735h-3.692v-1.745h-.33v6.02h.33v-3.897h3.692v3.907h.353v-6.02zm5.406 0v1.735h-3.599v-1.735h-.349v6.02h.349v-3.907h3.599v3.907h.427v-6.02z"/></svg>
\ No newline at end of file