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/1f575-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f575-1f3fb-200d-2640-fe0f.svg
index 22d2265a6..b85b5dba8 100644
--- a/public/emoji/1f575-1f3fb-200d-2640-fe0f.svg
+++ b/public/emoji/1f575-1f3fb-200d-2640-fe0f.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(8.9422,21.9562)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.233,0.338 0.379,0.775 0.379,1.259 0,1.061 -0.679,1.921 -1.516,1.921 -0.837,0 -1.516,-0.86 -1.516,-1.921 0,-0.878 0.467,-1.61 1.101,-1.84 -0.233,-0.732 -2.749,-7.873 -1.507,-10.395 1.242,-2.522 10.546,-1.45 11.242,-0.314 C 7.649,-9.26 0.525,-3.234 0,0"/></g><g transform="translate(27.0558,21.9562)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.233,0.338 -0.379,0.775 -0.379,1.259 0,1.061 0.679,1.921 1.516,1.921 0.837,0 1.516,-0.86 1.516,-1.921 0,-0.878 -0.467,-1.61 -1.101,-1.84 C 1.785,-1.313 4.301,-8.454 3.059,-10.976 1.817,-13.498 -7.487,-12.426 -8.183,-11.29 -7.649,-9.26 -0.525,-3.234 0,0"/></g><g transform="translate(33,0)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 c 0,3.314 -2.686,6 -6,6 l -18,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-1 30,0 z"/></g><g transform="translate(26.75,15.5645)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.187,-0.208 2.619,-0.129 2.416,-0.917 1.937,-2.771 -0.187,-2.084 -0.562,-2.104 -0.937,-2.125 0,0 0,0"/></g><g transform="translate(27.0625,15.3555)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.875,-0.25 2.541,-0.416 1.166,-0.958 0.394,-1.263 -1.077,-5.761 -2.165,-5.076 -3.253,-4.392 0,0 0,0"/></g><g transform="translate(9.2554,15.5645)" id="g40"><path id="path42" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.187,-0.208 -2.619,-0.129 -2.416,-0.917 -1.937,-2.771 0.187,-2.084 0.562,-2.104 0.938,-2.125 0,0 0,0"/></g><g transform="translate(8.9429,15.3555)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.875,-0.25 -2.541,-0.416 -1.166,-0.958 -0.394,-1.263 1.077,-5.761 2.165,-5.076 3.253,-4.392 0,0 0,0"/></g><g transform="translate(28,20.5)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.903 -4.477,-12.5 -10,-12.5 -5.523,0 -10,5.597 -10,12.5 0,6.903 4.477,12.5 10,12.5 C -4.477,12.5 0,6.903 0,0"/></g><g transform="translate(19,15.5)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 l -1,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5 l 1,0 C -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(7.6567,21.2119)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 0,0 c 0.148,-0.147 0.888,-0.591 1.036,-1.034 0.148,-0.443 0.444,-2.954 1.333,-3.693 0.916,-0.762 4.37,-0.478 5.031,-0.149 1.481,0.738 1.662,2.798 1.924,3.842 0.148,0.591 1.036,0.591 1.036,0.591 0,0 0.889,0 1.036,-0.591 0.262,-1.044 0.444,-3.104 1.924,-3.841 0.662,-0.33 4.116,-0.614 5.034,0.148 0.887,0.739 1.183,3.25 1.331,3.693 0.147,0.444 0.888,0.887 1.035,1.034 0.149,0.148 0.149,0.739 0,0.887 C 20.424,1.182 16.932,1.445 13.172,1.034 12.422,0.953 12.137,0.739 10.36,0.739 8.584,0.739 8.298,0.953 7.548,1.034 3.789,1.445 0.296,1.182 0,0.887 -0.147,0.739 -0.147,0.148 0,0"/></g><g transform="translate(7.8579,27.6055)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.359,8.901 5.932,8.372 3.512,-0.406 4.889,-0.825 7.833,-0.097 1.947,0.482 4.065,-1.135 5.342,-4.379 0.815,-2.067 1.224,-4.041 1.224,-4.041 0,0 3.938,0.385 4.165,-1.732 0.227,-2.117 -4.354,-4.716 -15.889,-4.716 -6.465,0 -13.135,2.358 -13.452,4.331 C -5.162,-0.289 0,0 0,0"/></g><g transform="translate(8.1246,28.8501)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.27,-1.104 -0.406,-1.871 -0.136,-0.768 0.226,-1.296 2.705,-1.824 3.287,-0.7 10.679,-0.692 15.059,0.384 1.759,0.432 2.886,0.719 2.751,1.583 -0.167,1.068 -0.197,1.066 -0.541,2.207 0,0 -1.477,-0.502 -3.427,-0.959 C 13.482,-1.104 6.177,-1.392 2.66,-0.624 0.786,-0.215 0,0 0,0"/></g><g transform="translate(7.9893,14.8975)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.354,-0.146 2.921,-1.378 7.48,-1.458 4.77,-0.084 6.234,-0.39 5.145,-1.459 -1.145,-1.125 -0.852,-2.894 -0.77,-3.418 0.081,-0.524 2.046,-1.916 2.208,-2.561 0.161,-0.644 -1.23,-5.961 -1.23,-5.961 l -8.728,0.252 C 1.539,-5.761 1.222,-6.104 0,-1 -0.241,0.008 0,0 0,0"/></g><g transform="translate(6.9893,14.8564)" id="g72"><path id="path74" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.354,-0.145 2.921,-1.378 7.48,-1.458 4.77,-0.084 6.234,-0.39 5.145,-1.459 l 0.208,-11.939 -8.728,0.252 C 1.539,-5.761 1.222,-6.104 0,-1 -0.241,0.008 0,0 0,0"/></g><g transform="translate(28.0518,14.8975)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.354,-0.146 -2.921,-1.378 -7.48,-1.458 -4.77,-0.084 -6.234,-0.39 -5.145,-1.459 1.146,-1.125 2.977,-2.892 2.895,-3.416 -0.081,-0.525 -4.171,-1.918 -4.333,-2.563 -0.161,-0.644 1.23,-5.961 1.23,-5.961 l 8.728,0.252 C -1.539,-5.761 -1.222,-6.104 0,-1 0.241,0.008 0,0 0,0"/></g><g transform="translate(28.958,14.8975)" id="g80"><path id="path82" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.354,-0.146 -2.921,-1.378 -7.48,-1.458 -4.77,-0.084 -6.234,-0.39 -5.145,-1.459 1.146,-1.125 2.977,-2.892 2.895,-3.416 -0.081,-0.525 -4.171,-1.918 -4.333,-2.563 -0.161,-0.644 1.229,-5.961 1.229,-5.961 l 8.657,-0.009 C -1.611,-6.023 -1.222,-6.104 0,-1 0.241,0.008 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M8.942 14.044c.233-.338.379-.775.379-1.259 0-1.061-.679-1.922-1.516-1.922s-1.516.86-1.516 1.922c0 .878.467 1.61 1.101 1.84-.234.732-2.749 7.872-1.507 10.395s10.546 1.451 11.242.314c-.534-2.03-7.658-8.056-8.183-11.29zm18.114 0c-.233-.338-.379-.775-.379-1.259 0-1.061.679-1.922 1.516-1.922s1.516.86 1.516 1.922c0 .878-.467 1.61-1.101 1.84.234.732 2.749 7.872 1.507 10.395s-10.546 1.451-11.242.314c.534-2.03 7.658-8.056 8.183-11.29z"/><path fill="#66757F" d="M33 36v-1c0-3.313-2.687-6-6-6H9c-3.313 0-6 2.687-6 6v1h30zm-6.25-15.565c1.188.208 2.619.129 2.416.917-.479 1.854-2.604 1.167-2.979 1.188-.375.02.563-2.105.563-2.105z"/><path fill="#292F33" d="M27.062 20.645c1.875.25 2.541.416 1.166.958-.772.305-2.243 4.803-3.331 4.118-1.087-.685 2.165-5.076 2.165-5.076z"/><path fill="#66757F" d="M9.255 20.435c-1.188.208-2.619.129-2.416.917.479 1.854 2.604 1.167 2.979 1.188.375.02-.563-2.105-.563-2.105z"/><path fill="#292F33" d="M8.943 20.645c-1.875.25-2.541.416-1.166.958.772.305 2.243 4.803 3.331 4.118 1.088-.685-2.165-5.076-2.165-5.076z"/><ellipse fill="#F7DECE" cx="18" cy="15.5" rx="10" ry="12.5"/><path fill="#C1694F" d="M19 20.5c0 .276-.224.5-.5.5h-1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#292F33" d="M7.657 14.788c.148.147.888.591 1.036 1.034.148.443.445 2.954 1.333 3.693.916.762 4.37.478 5.032.149 1.48-.738 1.662-2.798 1.924-3.842.148-.591 1.036-.591 1.036-.591s.888 0 1.036.591c.262 1.044.444 3.104 1.924 3.841.662.33 4.116.614 5.034-.147.887-.739 1.183-3.25 1.331-3.694.146-.443.888-.886 1.035-1.034.148-.148.148-.739 0-.887-.296-.295-3.788-.559-7.548-.148-.75.082-1.035.295-2.812.295-1.776 0-2.062-.214-2.812-.295-3.759-.411-7.252-.148-7.548.148-.149.148-.149.74-.001.887z"/><path fill="#66757F" d="M7.858 8.395S9.217-.506 13.79.023c3.512.406 4.89.825 7.833.097 1.947-.482 4.065 1.136 5.342 4.379.816 2.068 1.224 4.041 1.224 4.041s3.938-.385 4.165 1.732c.228 2.117-4.354 4.716-15.889 4.716C10 14.987 3.33 12.63 3.013 10.657c-.317-1.973 4.845-2.262 4.845-2.262z"/><path fill="#292F33" d="M8.125 7.15s-.27 1.104-.406 1.871c-.136.768.226 1.296 2.705 1.824 3.287.7 10.679.692 15.059-.383 1.759-.432 2.886-.72 2.751-1.583-.167-1.068-.196-1.066-.541-2.208 0 0-1.477.502-3.427.96-2.66.624-9.964.911-13.481.144-1.875-.41-2.66-.625-2.66-.625zm-.136 13.953c-.354.145 2.921 1.378 7.48 1.458 4.771.084 6.234.39 5.146 1.459-1.146 1.125-.852 2.894-.771 3.418.081.524 2.047 1.916 2.208 2.56.161.645-1.229 5.961-1.229 5.961l-8.729-.252c-2.565-8.844-2.883-8.501-4.105-13.604-.241-1.008 0-1 0-1z"/><path fill="#66757F" d="M6.989 21.144c-.354.146 2.921 1.378 7.48 1.458 4.771.084 6.234.39 5.146 1.459L19.822 36l-8.729-.252c-2.565-8.844-2.883-8.501-4.105-13.604-.24-1.008.001-1 .001-1z"/><path fill="#292F33" d="M28.052 21.103c.354.145-2.921 1.378-7.479 1.458-4.771.084-6.234.39-5.146 1.459 1.146 1.125 2.976 2.892 2.896 3.416-.081.524-4.172 1.918-4.333 2.562-.161.645 1.229 5.961 1.229 5.961l8.729-.252c2.565-8.844 2.883-8.501 4.104-13.604.241-1.008 0-1 0-1z"/><path fill="#66757F" d="M28.958 21.103c.354.145-2.921 1.378-7.479 1.458-4.771.084-6.234.39-5.146 1.459 1.146 1.125 2.977 2.892 2.896 3.416-.081.524-4.172 1.918-4.333 2.562-.161.645 1.229 5.961 1.229 5.961l8.657.01c2.565-8.844 2.955-8.763 4.177-13.866.24-1.008-.001-1-.001-1z"/></svg>
\ No newline at end of file