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/1f432.svg b/public/emoji/1f432.svg
index 4f099dc73..1c1b4347d 100644
--- a/public/emoji/1f432.svg
+++ b/public/emoji/1f432.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(35.125,22.6563)" id="g20"><path id="path22" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1 0.771,2.327 0.771,2.635 0,0.656 -1.553,0.422 -1.626,1.047 C -1.064,5.476 1.031,7 -2.601,6.994 -3.953,6.992 -2.875,8.762 -2.875,9.719 c 0,0.957 -2.596,0.145 -3.552,0.145 -0.957,0 -0.957,2.87 -1.913,2.87 -2.87,0 -3.827,-2.87 -4.783,-2.87 -0.957,0 -1.744,3.62 -2.87,2.87 -2.87,-1.913 -3.826,-7.653 -3.826,-7.653 0,0 4.783,3.826 10.522,2.87 5.345,-0.891 4.79,-10.821 5.641,-16.889 l -6.86,-13.718 3.36,0 c 0.344,1.5 1.939,0.529 2.375,1.687 0.381,1.016 -0.67,1.966 -0.094,2.969 0.576,1.003 0.978,0.755 2.094,1.375 1.183,0.657 0,2.199 0,3.156 0,0.956 2.312,1.574 2.312,2.531 0,0.63 -1.068,1.292 -0.811,2.357 0.257,1.064 1.586,1.185 1.749,2.184 0.137,0.846 -0.921,1.455 -0.796,2.392 0.125,0.938 1.174,1.379 1.174,2.097 C 0.847,-1.189 0,-0.906 0,0"/></g><g transform="translate(34.4375,22.5425)" id="g24"><path id="path26" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.038 -2.87,9.085 -9.566,9.085 -6.696,0 -17.265,-10.024 -20.088,-10.095 -1.914,1.947 -4.784,-0.055 -4.784,-2.019 0,-3.028 5.374,-4.61 5.646,-4.898 1.088,-1.15 3.92,-8.083 8.704,-1.946 0.802,1.031 1.301,0.422 3.483,-0.542 7.237,-3.856 -1.832,-12.127 -1.832,-12.127 l 9.566,0 C -4.089,-17.759 0,-8.699 0,-0.545 c 0,0 -0.016,-0.006 -0.02,-0.008 C -0.015,-0.369 0,-0.184 0,0"/></g><g transform="translate(23.915,23.9102)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.056 -0.856,-1.913 -1.913,-1.913 -1.057,0 -1.913,0.857 -1.913,1.913 0,1.057 0.856,1.913 1.913,1.913 C -0.856,1.913 0,1.057 0,0"/></g><g transform="translate(4.7832,18.6494)" id="g32"><path id="path34" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.793 -0.643,-0.479 -1.435,-0.479 -0.793,0 -1.435,-0.314 -1.435,0.479 0,0.792 0.642,1.435 1.435,1.435 C -0.643,1.435 0,0.792 0,0"/></g><g transform="translate(18.1758,17.2178)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.058 -0.643,-0.956 -1.436,-0.956 -0.792,0 -1.434,-0.102 -1.434,0.956 0,1.056 0.642,3.826 1.434,3.826 C -0.643,3.826 0,1.056 0,0"/></g><g transform="translate(14.3491,16.2617)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.058 -0.643,-0.957 -1.435,-0.957 -0.793,0 -1.435,-0.101 -1.435,0.957 0,1.056 0.642,3.826 1.435,3.826 C -0.643,3.826 0,1.056 0,0"/></g><g transform="translate(18.04,17.2051)" id="g44"><path id="path46" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.076,-0.726 -10.192,-2.007 -12.394,-2.59 0.275,-0.29 0.661,-0.95 1.162,-1.674 2.414,0.624 6.975,1.724 11.502,2.369 0.524,0.075 0.887,0.561 0.813,1.084 C 1.008,-0.288 0.52,0.076 0,0"/></g><g transform="translate(18.5889,23.3906)" id="g48"><path id="path50" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.258,0 -0.515,0.098 -0.71,0.295 -0.388,0.391 -0.388,1.021 0.002,1.41 0.129,0.13 3.222,3.163 8.36,3.163 0.553,0 1,-0.448 1,-1 0,-0.552 -0.447,-1 -1,-1 C 3.371,2.868 0.73,0.314 0.703,0.288 0.509,0.096 0.254,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3E721D" d="M35.125 13.344c0-1 .771-2.327.771-2.635 0-.656-1.553-.421-1.626-1.046-.209-1.794 1.887-3.318-1.745-3.312-1.352.002-.274-1.768-.274-2.725 0-.957-2.596-.145-3.552-.145-.957 0-.957-2.87-1.913-2.87-2.87 0-3.827 2.87-4.783 2.87-.957 0-1.744-3.621-2.87-2.87-2.87 1.913-3.826 7.653-3.826 7.653s4.783-3.826 10.522-2.87c5.345.891 4.79 10.821 5.641 16.888L24.609 36h3.359c.344-1.5 1.939-.529 2.375-1.688.381-1.016-.67-1.966-.094-2.969s.978-.755 2.094-1.375c1.184-.657 0-2.199 0-3.156 0-.956 2.312-1.574 2.312-2.531 0-.63-1.068-1.292-.812-2.356.257-1.064 1.586-1.186 1.749-2.184.138-.847-.921-1.455-.796-2.393s1.174-1.378 1.174-2.097c.002-.718-.845-1.001-.845-1.907z"/><path fill="#77B255" d="M34.438 13.458c0-4.038-2.87-9.085-9.566-9.085-6.695 0-17.265 10.024-20.088 10.096C2.87 12.521 0 14.523 0 16.486c0 3.028 5.373 4.61 5.646 4.899 1.088 1.149 3.92 8.083 8.704 1.945.803-1.03 1.302-.422 3.483.542C25.069 27.729 16 36 16 36h9.566c4.782-4.783 8.871-13.844 8.871-21.997l-.021.008c.007-.185.022-.369.022-.553z"/><path fill="#292F33" d="M23.915 12.09c0 1.056-.856 1.913-1.913 1.913s-1.913-.857-1.913-1.913c0-1.057.856-1.913 1.913-1.913 1.057-.001 1.913.856 1.913 1.913z"/><path fill="#3E721D" d="M4.783 17.351c0 .793-.643.479-1.435.479s-1.435.315-1.435-.479c0-.792.643-1.435 1.435-1.435.793 0 1.435.643 1.435 1.435z"/><path fill="#FFF" d="M18.176 18.782c0 1.058-.643.956-1.436.956-.792 0-1.434.101-1.434-.956 0-1.056.642-3.826 1.434-3.826.793 0 1.436 2.771 1.436 3.826zm-3.827.956c0 1.058-.643.957-1.435.957s-1.435.101-1.435-.957c0-1.056.643-3.826 1.435-3.826.792.001 1.435 2.771 1.435 3.826z"/><path fill="#3E721D" d="M18.04 18.795c-5.076.726-10.192 2.007-12.394 2.59.275.29.661.95 1.162 1.674 2.415-.624 6.975-1.724 11.503-2.369.524-.074.887-.561.812-1.083-.075-.524-.563-.888-1.083-.812zm.549-6.186c-.258 0-.515-.098-.709-.295-.388-.391-.388-1.021.001-1.41.129-.129 3.222-3.163 8.36-3.163.553 0 1 .448 1 1s-.447 1-1 1c-4.281 0-6.923 2.554-6.949 2.58-.194.192-.449.288-.703.288z"/></svg>
\ No newline at end of file