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/1f3c3.svg b/public/emoji/1f3c3.svg
index 2916e5897..3c090f378 100644
--- a/public/emoji/1f3c3.svg
+++ b/public/emoji/1f3c3.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(14.3159,31.7393)" 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 0,-2.138 -0.37,-3.348 -0.252,-0.837 1.474,-0.941 1.474,-0.941 0,0 1.207,0.267 1.003,-1.676 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(27.001,18)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.367,0 -0.72,0.202 -0.896,0.553 -1.788,3.575 -7.366,5.48 -7.422,5.499 -0.523,0.176 -0.806,0.742 -0.631,1.265 0.175,0.523 0.735,0.809 1.264,0.632 C -7.424,7.862 -1.267,5.768 0.893,1.447 1.141,0.953 0.94,0.353 0.446,0.105 0.303,0.034 0.15,0 0,0"/></g><g transform="translate(12.0015,1.999)" id="g28"><path id="path30" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.182,0 -0.367,0.025 -0.55,0.078 -1.062,0.304 -1.678,1.41 -1.374,2.473 l 2,7 c 0.124,0.434 0.392,0.814 0.76,1.077 l 7,5 c 0.897,0.642 2.148,0.435 2.79,-0.465 0.642,-0.898 0.434,-2.147 -0.465,-2.789 L 3.73,7.779 1.922,1.451 C 1.671,0.573 0.87,0.001 0,0"/></g><g transform="translate(26.998,5)" id="g32"><path id="path34" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.3,0 -0.605,0.067 -0.893,0.211 l -6,3 C -7.57,3.55 -7.998,4.242 -7.998,5 l 0,5 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 l 0,-3.764 4.894,-2.447 C 1.885,3.295 2.285,2.094 1.791,1.105 1.441,0.404 0.734,0 0,0"/></g><g transform="translate(19.0142,30.215)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.424,-2.16 -2.354,-2.953 -4.272,-3.523 -1.83,-0.543 -3.045,2.679 -3.105,4.864 -0.06,2.201 2.625,3.654 4.589,3.268 C -0.824,4.224 0.424,2.16 0,0"/></g><g transform="translate(12.5171,34.3216)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.67,1.637 4.456,1.352 5.937,0.147 7.408,-1.049 7.461,-3.291 7.038,-4.716 6.615,-6.14 6.2,-6.059 6.2,-6.059 c 0,0 -1.976,-0.432 -2.109,1.399 -0.042,0.579 0.605,0.886 -0.089,1.741 C 3.555,-2.37 2.55,-2.634 2.539,-3.422 2.528,-4.21 2.127,-4.059 2.127,-4.059 l -1.168,2.096 c 0,0 -1.021,0.067 -1.596,-0.866 C -0.999,-3.415 -2.332,-1.43 0,0"/></g><g transform="translate(21.1487,25.3429)" id="g44"><path id="path46" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.89,1.522 -2.123,2.212 -3.398,1.564 -3.993,-2.029 -1.881,-5.138 0.258,-11.373 0,0 1,-0.927 3.359,-0.296 1.659,0.445 2.691,-0.706 2.976,-0.398 C 3.48,-10.194 2.143,-3.664 0,0"/></g><g transform="translate(16.1431,23.5146)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.028,-0.046 -2.825,-4.631 -7.339,-5.534 l 0.004,-0.02 c -0.457,-0.092 -0.808,-0.476 -0.808,-0.961 0,-0.552 0.448,-1 1,-1 0.069,0 0.128,0.026 0.193,0.04 l 0.004,-0.02 c 5.372,1.074 8.529,6.246 8.661,6.466 L 0,0 Z"/></g><g transform="translate(29.3946,7.7435)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.103,0.369 -0.192,0.668 -0.574,0.756 -0.611,0.141 -0.867,0.17 -0.867,0.17 -0.305,0.021 -0.966,-0.064 -1.064,-0.415 -0.717,-2.543 -0.657,-5.568 -0.246,-6.403 0.242,-0.493 0.981,-0.429 1.127,0.094 C -1.192,-4.254 -0.374,-1.337 0,0"/></g><g transform="translate(12.6975,0.9245)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.362,-0.125 0.678,0.152 0.789,0.528 0.965,1.129 1.01,1.384 1.01,1.384 1.049,1.687 1.003,2.351 0.659,2.471 -1.837,3.337 -4.861,3.457 -5.719,3.096 -6.225,2.884 -6.205,2.142 -5.691,1.965 -4.176,1.442 -1.312,0.453 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#2A6797" d="M12.002 34.001c-.182 0-.367-.025-.55-.078-1.062-.304-1.677-1.41-1.374-2.473l2-7c.124-.435.392-.814.76-1.077l7-5c.896-.642 2.147-.435 2.789.465.642.898.434 2.147-.465 2.789l-6.431 4.595-1.808 6.328c-.251.878-1.051 1.45-1.921 1.451z"/><path fill="#4289C1" d="M26.998 31c-.3 0-.605-.067-.892-.211l-6-3C19.428 27.45 19 26.758 19 26v-5c0-1.104.896-2 2-2s2 .896 2 2v3.764l4.895 2.447c.988.494 1.389 1.695.895 2.684-.352.701-1.058 1.105-1.792 1.105z"/><path fill="#292F33" d="M29.395 28.257c.103-.369-.192-.668-.574-.756-.611-.141-.867-.17-.867-.17-.305-.022-.965.064-1.064.414-.717 2.543-.657 5.569-.246 6.404.242.493.981.429 1.128-.095l1.623-5.797zm-16.697 6.819c.362.125.678-.152.789-.528.177-.601.221-.856.221-.856.04-.303-.007-.967-.35-1.087-2.496-.867-5.52-.986-6.378-.626-.506.213-.486.954.027 1.131l5.691 1.966z"/><path fill="#FFDC5D" d="M18.329 7.294c.321-.415.567-.904.685-1.509.424-2.16-.824-4.224-2.788-4.609-1.964-.386-4.649 1.068-4.589 3.268.06 2.185 1.274 5.408 3.104 4.864.483-.143.966-.301 1.426-.491.196.232.335.648.255 1.409-.207 1.94 2.472 2.616 2.677.672.162-1.537-.797-2.513-.77-3.604z"/><path fill="#FFAC33" d="M12.517 1.678c2.67-1.637 4.456-1.352 5.937-.147 1.471 1.196 1.524 3.438 1.101 4.863-.423 1.425-.838 1.343-.838 1.343s-1.977.433-2.109-1.399c-.042-.579.605-.886-.089-1.741-.446-.55-1.452-.285-1.463.503-.011.788-.412.637-.412.637l-1.168-2.096s-1.021-.067-1.596.866c-.362.586-1.695-1.399.637-2.829z"/><path fill="#FFDC5D" d="M27.001 18c-.367 0-.72-.202-.896-.553-1.788-3.576-7.366-5.481-7.423-5.5-.523-.175-.806-.742-.63-1.265.174-.523.735-.809 1.264-.632.261.087 6.418 2.181 8.578 6.502.247.494.047 1.095-.447 1.342-.143.072-.296.106-.446.106z"/><path fill="#77B255" d="M21.149 10.657c-.89-1.522-2.123-2.212-3.398-1.564-3.992 2.029-1.881 5.138.259 11.373 0 0 1 .927 3.358.296 1.659-.444 2.691.706 2.976.398.285-.309-1.053-6.839-3.195-10.503z"/><path fill="#FFDC5D" d="M16.143 12.485c-.028.046-2.825 4.631-7.339 5.534l.004.02C8.351 18.131 8 18.516 8 19c0 .553.448 1 1 1 .068 0 .128-.025.192-.039l.004.02c5.372-1.074 8.529-6.246 8.661-6.466l-1.714-1.03z"/></svg>
\ No newline at end of file