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/1f3f7.svg b/public/emoji/1f3f7.svg
index 3851970f9..60462664e 100644
--- a/public/emoji/1f3f7.svg
+++ b/public/emoji/1f3f7.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.4214,24.5786)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.585,-0.585 -1.533,-0.585 -2.118,0 -0.585,0.585 -0.586,1.533 0,2.118 0.585,0.586 1.533,0.585 2.118,0 C 0.584,1.533 0.585,0.585 0,0 M 23.595,-8.759 8.923,5.675 C 8.265,6.334 7.402,6.421 6.539,6.421 l -0.007,0 -10.071,0 c -1.853,0 -2.882,-1.029 -2.882,-2.882 l 0,-10.071 0,-0.011 c 0,-0.861 0.088,-1.723 0.746,-2.38 L 8.878,-23.595 c 1.311,-1.311 3.378,-1.311 4.689,0 l 10.059,10.088 c 1.31,1.311 1.28,3.437 -0.031,4.748"/></g><g transform="translate(8.4219,24.5781)" id="g24"><path id="path26" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.585,-0.585 -1.534,-0.585 -2.119,0 -0.585,0.586 -0.586,1.534 0,2.119 0.585,0.587 1.534,0.585 2.119,0 C 0.585,1.534 0.586,0.586 0,0 m 1.53,3.649 c -1.43,1.431 -3.749,1.431 -5.179,0 -1.431,-1.429 -1.431,-3.749 0,-5.179 1.43,-1.43 3.749,-1.43 5.179,0 1.431,1.43 1.43,3.749 0,5.179"/></g><g transform="translate(8.5068,25.499)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.391,-0.391 -1.023,-0.391 -1.415,0 -0.391,0.391 -0.39,1.023 0,1.414 L 7.07,9.899 c 0.391,0.391 1.024,0.392 1.415,0 0.391,-0.39 0.39,-1.023 0,-1.414 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFD983" d="M32.017 20.181L17.345 5.746C16.687 5.087 15.823 5 14.96 5H4.883C3.029 5 2 6.029 2 7.883v10.082c0 .861.089 1.723.746 2.38L17.3 35.017c1.311 1.31 3.378 1.31 4.688 0l10.059-10.088c1.31-1.312 1.28-3.438-.03-4.748zm-23.596-8.76c-.585.585-1.533.585-2.118 0s-.586-1.533 0-2.118c.585-.586 1.533-.585 2.118 0 .585.586.586 1.533 0 2.118z"/><path fill="#D99E82" d="M9.952 7.772c-1.43-1.431-3.749-1.431-5.179 0-1.431 1.43-1.431 3.749 0 5.18 1.43 1.43 3.749 1.43 5.18 0 1.43-1.431 1.429-3.749-.001-5.18zm-1.53 3.65c-.585.585-1.534.585-2.119 0-.585-.585-.586-1.534 0-2.119.585-.587 1.534-.585 2.119 0 .585.585.586 1.533 0 2.119z"/><path fill="#C1694F" d="M8.507 10.501c-.391.391-1.023.391-1.415 0-.391-.391-.39-1.023 0-1.414L15.577.602c.391-.391 1.023-.391 1.415 0 .391.391.39 1.023 0 1.414l-8.485 8.485z"/></svg>
\ No newline at end of file