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/1f327.svg b/public/emoji/1f327.svg
index 2ff8cdfa3..99f42f5aa 100644
--- a/public/emoji/1f327.svg
+++ b/public/emoji/1f327.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(28,32)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.825,0 -1.62,-0.125 -2.369,-0.357 -3.256,2.178 -5.662,4 -8.5,4 -11.544,4 -14.092,1.904 -14.799,-0.921 -15.553,-0.351 -16.481,0 -17.5,0 -19.985,0 -22,-2.015 -22,-4.5 c 0,-0.604 0.123,-1.178 0.339,-1.704 C -22.09,-6.085 -22.533,-6 -23,-6 c -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.238,-5 5,-5 l 23,0 c 4.418,0 8,3.581 8,8 0,4.418 -3.582,8 -8,8"/></g><g transform="translate(11.999,11.0391)" id="g24"><path id="path26" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.983,1.713 C -3.622,1.368 -4.045,0.688 -4.019,-0.086 -3.982,-1.188 -3.053,-2.062 -1.943,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(10.02,3.5791)" id="g28"><path id="path30" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.983,1.713 C -3.622,1.368 -4.045,0.688 -4.019,-0.086 -3.982,-1.189 -3.053,-2.062 -1.943,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(5.02,8.0391)" id="g32"><path id="path34" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.983,1.713 C -3.622,1.368 -4.045,0.688 -4.019,-0.086 -3.982,-1.188 -3.053,-2.062 -1.943,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(23.0195,11.0391)" id="g36"><path id="path38" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.018,-0.086 -3.981,-1.188 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(16.999,7.0391)" id="g40"><path id="path42" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.019,-0.086 -3.981,-1.188 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(22.0195,2.5791)" id="g44"><path id="path46" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.018,-0.086 -3.981,-1.189 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(28.999,8.0391)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.019,-0.086 -3.981,-1.188 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z"/><path fill="#5DADEC" d="M11.999 24.961l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.98-.937 1.943-2.039zm-1.979 7.46L9.907 29l-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm-5-4.46l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.102.966 1.975 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm18-3l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm-6.021 4l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm5.021 4.46L21.906 30l-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm6.979-5.46l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039z"/></svg>
\ No newline at end of file