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/1f549.svg b/public/emoji/1f549.svg
index cb310e362..9e6a1efb2 100644
--- a/public/emoji/1f549.svg
+++ b/public/emoji/1f549.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,4)" id="g20"><path id="path22" style="fill:#9266cc;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,28 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><g transform="translate(23.6898,29.4057)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.853,0.79 -1.723,1.596 -2.597,2.405 -2.623,2.381 -5.018,-0.061 -5.018,-0.061 l 2.553,-2.384 c 0,0 1.914,1.847 2.465,2.445 m -7.479,0.198 c -0.048,-0.075 0.312,-6.076 5.447,-6.076 3.681,0 6.533,2.018 6.707,2.192 0.108,0.107 -1.709,2.832 -1.803,2.84 -0.116,0.011 -2.69,-2.42 -4.899,-2.42 -3.54,0 -5.328,3.247 -5.452,3.464"/></g><g transform="translate(7.2916,23.6398)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.881,-3.062 c 0,0 2.465,1.79 4.841,1.79 1.981,0 2.222,-1.097 2.222,-1.664 0,-0.568 -0.519,-2.767 -5.546,-1.914 0.092,-0.61 0.457,-2.679 1.615,-4.05 0.883,0.092 4.448,0.55 4.448,-2.801 0,-3.046 -3.108,-3.351 -3.657,-3.351 -0.548,0 -4.631,-0.396 -7.952,7.861 -0.152,-0.609 -0.244,-2.986 0.945,-5.971 1.188,-2.986 3.473,-6.085 7.099,-6.085 3.625,0 7.952,2.607 5.21,9.607 l 1.98,0 c 1.097,0 2.102,0.356 3.108,2.946 0.831,2.142 1.95,3.225 2.925,3.225 0.67,0 2.559,-0.078 2.559,-4.405 0,-3.88 -1.828,-5.623 -3.737,-5.65 -1.764,-0.026 -3.597,1.471 -4.124,2.948 0,0 -0.304,-5.909 4.043,-6.16 5.819,-0.337 5.89,6.005 5.89,7.164 0,2.838 -0.792,8.747 -5.149,8.747 -3.778,0 -4.692,-2.193 -5.606,-3.807 -0.914,-1.615 -1.737,-3.808 -4.997,-2.072 1.554,0.854 2.986,2.408 2.986,4.358 0,1.95 -0.701,4.631 -4.479,4.905 C 2.727,2.833 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><g fill="#FFF"><path d="M16.211 6.396c-.048.075.312 6.076 5.447 6.076 3.681 0 6.534-2.018 6.708-2.191.108-.107-1.709-2.832-1.803-2.841-.116-.01-2.691 2.421-4.9 2.421-3.54 0-5.328-3.247-5.452-3.465zm7.479.198l-2.597-2.405c-.026.024-2.421 2.466-2.421 2.466l2.553 2.383c0 .001 1.914-1.846 2.465-2.444z"/><path d="M7.292 12.36l1.881 3.062s2.464-1.79 4.841-1.79c1.98 0 2.222 1.097 2.222 1.664s-.519 2.767-5.546 1.914c.091.609.457 2.678 1.614 4.049.884-.091 4.448-.55 4.448 2.802 0 3.045-3.108 3.351-3.656 3.351-.549 0-4.631.396-7.952-7.861-.153.609-.244 2.986.944 5.972s3.473 6.084 7.099 6.084S21.139 29 18.397 22h1.98c1.097 0 2.102-.356 3.108-2.946.831-2.141 1.95-3.225 2.925-3.225.67 0 2.559.078 2.559 4.405 0 3.88-1.828 5.623-3.737 5.651-1.764.025-3.597-1.471-4.124-2.948 0 0-.305 5.909 4.042 6.161 5.82.337 5.891-6.005 5.891-7.165 0-2.837-.792-8.747-5.149-8.747-3.778 0-4.692 2.193-5.606 3.807-.914 1.615-1.737 3.808-4.997 2.071 1.554-.853 2.986-2.407 2.986-4.357s-.701-4.631-4.479-4.906-6.504 2.559-6.504 2.559z"/></g></svg>
\ No newline at end of file