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/1f5ef.svg b/public/emoji/1f5ef.svg
index f9f4c9be1..3aba53cc6 100644
--- a/public/emoji/1f5ef.svg
+++ b/public/emoji/1f5ef.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"/><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g transform="translate(27.0664,9.4814)" id="g12"><path id="path14" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.867,4.337 2.92,3.495 0.444,6.796 l 4.587,1.835 -4.716,2.83 3.244,2.433 -4.375,0 2.768,3.691 -4.329,-0.866 1.292,6.029 -4.727,-4.298 -1.818,4.544 -2.887,-5.773 -2.858,4.763 -1.335,-4.454 -4.985,3.324 2.169,-5.207 -4.027,0.895 2.457,-3.276 -4.118,-1.83 4.531,-2.719 -1.715,-2.573 3.881,0 -5.487,-10.13 9.201,7.528 1.849,-4.621 2.937,4.895 2.887,-5.773 1.786,4.465 L 0,0 Z"/></g><g transform="translate(21.7458,30.0681)" id="g16"><path id="path18" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.183,5.457 -3.113,-6.227 -3.142,5.237 -1.664,-5.547 -7.015,4.677 2.831,-6.794 -4.973,1.105 3.542,-4.724 -4.881,-2.17 5.468,-3.281 -2.284,-3.426 4.119,0 -7.513,-13.87 12.799,10.471 2.151,-5.378 3.063,5.104 3.113,-6.226 2.214,5.535 4.655,-3.492 -1.132,5.662 5.213,-1.158 -3.524,4.7 5.412,2.164 -5.284,3.17 4.757,3.568 -5.625,0 3.232,4.308 L 4.565,-2.269 6.273,5.702 0,0 Z m -2.309,2.408 1.817,-4.545 4.727,4.299 -1.291,-6.029 4.329,0.866 -2.768,-3.692 4.374,0 -3.243,-2.433 4.716,-2.83 -4.588,-1.835 2.476,-3.301 -3.787,0.843 0.868,-4.338 -3.344,2.508 -1.786,-4.465 -2.887,5.773 -2.937,-4.895 -1.849,4.621 -9.202,-7.528 5.487,10.13 -3.881,0 1.716,2.574 -4.531,2.719 4.118,1.829 -2.457,3.276 4.026,-0.895 -2.169,5.207 4.985,-3.323 1.336,4.453 2.858,-4.763 2.887,5.774 z"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M27.066 26.519l-.867-4.337 3.787.841-2.475-3.3 4.587-1.835-4.716-2.83 3.243-2.433H26.25l2.769-3.691-4.33.865 1.292-6.028-4.727 4.297-1.817-4.544-2.887 5.774-2.858-4.763-1.336 4.453-4.985-3.323 2.169 5.207-4.026-.895 2.457 3.275-4.118 1.831 4.531 2.718-1.716 2.574h3.881l-5.487 10.13 9.202-7.528 1.848 4.621 2.938-4.896 2.887 5.774 1.786-4.465z"/><path fill="#67757F" d="M29.489 20.277l5.413-2.165-5.284-3.17 4.757-3.567H28.75l3.231-4.309L26.31 8.2 28.018.229l-6.272 5.702L19.563.475 16.45 6.702l-3.142-5.237-1.664 5.546-7.015-4.676L7.46 9.128 2.486 8.023l3.543 4.724-4.882 2.17 5.469 3.281-2.284 3.426h4.119L.938 35.494l12.798-10.472 2.151 5.379 3.062-5.104 3.113 6.227 2.214-5.535 4.656 3.492-1.133-5.663 5.213 1.158-3.523-4.699zM19.05 22.702l-2.938 4.896-1.849-4.621-9.202 7.528 5.487-10.13h-3.88l1.716-2.574-4.531-2.719 4.118-1.83-2.457-3.275 4.026.895-2.169-5.207 4.985 3.323 1.336-4.454 2.858 4.763 2.887-5.773 1.817 4.544 4.728-4.298-1.292 6.029 4.329-.866-2.769 3.691h4.375l-3.243 2.433 4.716 2.83-4.587 1.835 2.476 3.301-3.787-.842.867 4.337-3.344-2.508-1.786 4.465-2.887-5.773z"/></svg>
\ No newline at end of file