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/1f95b.svg b/public/emoji/1f95b.svg
index 7157c078b..73947e88e 100644
--- a/public/emoji/1f95b.svg
+++ b/public/emoji/1f95b.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="clipPath24" clipPathUnits="userSpaceOnUse"><path id="path26" 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 transform="translate(8.7771,31.5417)" id="g12"><path id="path14" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2.015,-27.542 14.333,0 L 18.536,0.021 0,0 Z"/></g><g transform="translate(25,4.7187)" id="g16"><path id="path18" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14.094,-0.156 -1.018,15.312 16.246,0 L 0,0 Z"/></g><g id="g20"><g clip-path="url(#clipPath24)" id="g22"><g transform="translate(27.8438,31.6352)" id="g28"><path id="path30" style="fill:none;stroke:#8899a6;stroke-width:2.3499999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 -1.969,-27.66 c -0.147,-1.481 -0.806,-1.975 -1.969,-1.975 l -11.812,0 c -0.975,0 -1.803,0.586 -1.969,1.975 L -19.687,0"/></g><g transform="translate(8.1562,31.6474)" id="g32"><path id="path34" style="fill:none;stroke:#8899a6;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 0,0 1.426,-17.865 1.753,-22.097 0.277,-3.581 0.739,-5.55 5.463,-5.55 l 2.628,0"/></g><g transform="translate(27.8438,31.6474)" id="g36"><path id="path38" style="fill:none;stroke:#8899a6;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 0,0 -1.426,-17.865 -1.753,-22.097 -0.277,-3.581 -0.739,-5.55 -5.463,-5.55 l -2.628,0"/></g><g transform="translate(29,31.9167)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.703 -2.73,-3.083 -11,-3.083 -8.27,0 -11,1.38 -11,3.083 0,1.704 2.73,3.083 11,3.083 C -2.73,3.083 0,1.704 0,0"/></g><g transform="translate(28.5322,31.8721)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.307,0.459 -0.927,0.583 -1.387,0.276 -2.086,-1.393 -7.274,-1.571 -9.097,-1.524 -0.01,10e-4 -0.019,-0.004 -0.029,-0.004 -0.009,0 -0.016,0.005 -0.025,0.004 -1.819,-0.049 -7.008,0.128 -9.097,1.524 -0.46,0.306 -1.08,0.183 -1.387,-0.276 -0.307,-0.459 -0.183,-1.08 0.276,-1.387 2.57,-1.717 7.917,-1.866 9.688,-1.866 0.289,0 0.476,0.004 0.547,0.006 0.071,-0.002 0.258,-0.006 0.548,-0.006 1.771,0 7.117,0.149 9.688,1.866 C 0.184,-1.081 0.308,-0.459 0,0"/></g><g transform="translate(25.8175,19.9401)" id="g48"><path id="path50" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.808 -3.504,-1.464 -7.827,-1.464 -4.322,0 -7.827,0.656 -7.827,1.464 0,0.808 3.505,1.464 7.827,1.464 C -3.504,1.464 0,0.808 0,0"/></g><path id="path52" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25.208,2.625 -14.167,0 0,1.833 14.167,0 0,-1.833 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M8.777 4.458L10.792 32h14.333l2.189-27.562z"/><path fill="#FFF" d="M25 31.281l-14.094.157-1.018-15.312h16.246z"/><path fill="#8899A6" d="M23.906 35.175H12.094c-1.712 0-2.914-1.153-3.135-3.011L6.984 4.448c-.046-.647.441-1.209 1.089-1.255.659-.045 1.209.442 1.255 1.088l1.969 27.66c.107.884.573.884.797.884h11.812c.516 0 .708 0 .8-.917l1.966-27.627c.046-.646.6-1.131 1.255-1.088.647.046 1.135.608 1.089 1.255l-1.969 27.659c-.252 2.541-1.847 3.068-3.141 3.068z"/><path fill="#8899A6" d="M18 33h-2.627c-5.532 0-6.167-2.684-6.46-6.474C8.585 22.295 7.16 4.432 7.16 4.432l1.993-.159s1.427 17.868 1.754 22.099c.265 3.439.556 4.628 4.466 4.628H18c.552 0 1 .447 1 1s-.448 1-1 1z"/><path fill="#8899A6" d="M20.627 33H18c-.552 0-1-.447-1-1s.448-1 1-1h2.627c3.91 0 4.2-1.189 4.466-4.628.328-4.232 1.754-22.099 1.754-22.099l1.994.159s-1.426 17.864-1.754 22.094c-.293 3.79-.927 6.474-6.46 6.474z"/><path fill="#CCD6DD" d="M29 4.083c0 1.703-2.73 3.083-11 3.083-8.269 0-11-1.38-11-3.083C7 2.38 9.73 1 18 1s11 1.38 11 3.083z"/><path fill="#FFF" d="M28.532 4.128c-.307-.459-.927-.583-1.387-.276-2.086 1.393-7.274 1.571-9.097 1.523-.01-.001-.019.005-.029.004-.009 0-.016-.004-.025-.004-1.819.049-7.008-.127-9.097-1.523-.46-.306-1.08-.183-1.387.276-.307.459-.183 1.08.276 1.387 2.57 1.717 7.917 1.866 9.688 1.866.289 0 .477-.004.547-.006.071.002.258.006.547.006 1.771 0 7.118-.148 9.688-1.866.46-.307.584-.928.276-1.387z"/><ellipse fill="#E1E8ED" cx="17.991" cy="16.06" rx="7.827" ry="1.464"/><path fill="#8899A6" d="M11.042 31.542h14.167v1.833H11.042z"/></svg>
\ No newline at end of file