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/1f1e7-1f1ee.svg b/public/emoji/1f1e7-1f1ee.svg
index 4b0122f05..e53644c54 100644
--- a/public/emoji/1f1e7-1f1ee.svg
+++ b/public/emoji/1f1e7-1f1ee.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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(18.0107,24.5895)" id="g20"><path id="path22" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.646,0 3.145,-0.617 4.291,-1.626 l 11.085,8.037 -30.83,0 11.129,-8.069 C -3.176,-0.63 -1.663,0 0,0"/></g><g transform="translate(24.5107,18.0895)" id="g24"><path id="path26" style="fill:#1eb53a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.928 -0.198,-1.809 -0.548,-2.608 l 12.037,-8.728 0,22.436 L -0.473,2.427 C -0.171,1.677 0,0.859 0,0"/></g><g transform="translate(11.5107,18.0895)" id="g28"><path id="path30" style="fill:#1eb53a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.842 0.165,1.644 0.457,2.383 l -11.968,8.676 0,-22.354 12.039,8.729 C 0.189,-1.779 0,-0.912 0,0"/></g><g transform="translate(18.0107,11.5895)" id="g32"><path id="path34" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.593,0 -3.051,0.575 -4.181,1.526 l -11.195,-8.115 30.674,0 L 4.146,1.495 C 3.021,0.562 1.576,0 0,0"/></g><g transform="translate(22.0285,15.5221)" id="g36"><path id="path38" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.778,0 -1.166,-0.674 -1.555,0 l -0.778,0 0.389,0.673 -0.389,0.674 0.778,0 L -1.166,2.02 -0.778,1.347 0,1.347 -0.389,0.673 0,0 Z m -2.851,4.538 -0.778,0 -0.389,-0.673 -0.389,0.673 -0.777,0 0.389,0.673 -0.389,0.674 0.777,0 0.389,0.673 0.389,-0.673 0.778,0 L -3.24,5.211 -2.851,4.538 Z M -5.703,0 -6.48,0 -6.869,-0.674 -7.258,0 l -0.778,0 0.389,0.673 -0.389,0.674 0.778,0 0.389,0.673 0.389,-0.673 0.777,0 L -6.091,0.673 -5.703,0 Z m 19.674,15.478 -2.613,0 L 0.273,7.441 c -1.145,1.009 -2.644,1.626 -4.291,1.626 -1.663,0 -3.175,-0.63 -4.325,-1.657 l -11.129,8.068 -2.557,0 0,-1.852 11.968,-8.676 c -0.291,-0.738 -0.457,-1.541 -0.457,-2.383 0,-0.911 0.19,-1.778 0.528,-2.566 l -12.039,-8.728 0,-1.795 2.636,0 11.194,8.116 c 1.131,-0.951 2.588,-1.527 4.181,-1.527 1.577,0 3.021,0.562 4.147,1.495 l 11.151,-8.084 2.691,0 0,1.754 -12.037,8.727 c 0.35,0.799 0.548,1.68 0.548,2.608 0,0.859 -0.17,1.677 -0.473,2.428 l 11.962,8.672 0,1.811 z"/></g><g transform="translate(18.7884,20.7335)" id="g40"><path id="path42" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.389,0.673 -0.778,0 -0.389,0.674 -0.388,-0.674 -0.778,0 0.389,-0.673 -0.389,-0.673 0.778,0 0.388,-0.674 0.389,0.674 0.778,0 L 0,0 Z"/></g><g transform="translate(18.0107,19.3866)" id="g44"><path id="path46" style="fill:#1eb53a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.389,0.673 -0.777,0 0.388,0.674 -0.388,0.673 0.777,0 L 0,2.694 0.389,2.02 1.166,2.02 0.778,1.347 1.166,0.673 0.389,0.673 0,0 Z M 1.383,0.798 1.066,1.347 1.383,1.895 1.599,2.27 1.166,2.27 0.533,2.27 0.216,2.819 0,3.194 -0.216,2.819 -0.533,2.27 l -0.633,0 -0.433,0 0.216,-0.375 0.317,-0.548 -0.317,-0.549 -0.216,-0.375 0.433,0 0.633,0 0.317,-0.548 L 0,-0.5 l 0.217,0.375 0.316,0.548 0.633,0 0.433,0 -0.216,0.375 z"/></g><g transform="translate(22.0285,15.5221)" id="g48"><path id="path50" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.389,0.673 0,1.347 l -0.778,0 -0.388,0.673 -0.389,-0.673 -0.778,0 L -1.944,0.673 -2.333,0 -1.555,0 -1.166,-0.674 -0.778,0 0,0 Z"/></g><g transform="translate(20.4732,15.5221)" id="g52"><path id="path54" style="fill:#1eb53a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.778,0 0.389,0.673 -0.389,0.674 0.778,0 0.389,0.673 0.389,-0.673 0.777,0 L 1.166,0.673 1.555,0 0.778,0 0.389,-0.674 0,0 Z m 1.772,0.125 -0.317,0.548 0.317,0.549 0.216,0.375 -0.433,0 -0.633,0 L 0.605,2.145 0.389,2.52 0.172,2.145 -0.144,1.597 l -0.634,0 -0.433,0 0.217,-0.375 0.317,-0.549 -0.317,-0.548 -0.217,-0.375 0.433,0 0.634,0 0.316,-0.549 0.217,-0.375 0.216,0.375 0.317,0.549 0.633,0 0.433,0 -0.216,0.375 z"/></g><g transform="translate(15.937,16.1954)" id="g56"><path id="path58" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.389,0.673 -0.778,0 -0.389,0.674 -0.388,-0.674 -0.778,0 0.389,-0.673 -0.389,-0.673 0.778,0 0.388,-0.674 0.389,0.674 0.778,0 L 0,0 Z"/></g><g transform="translate(15.1594,14.8485)" id="g60"><path id="path62" style="fill:#1eb53a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.389,0.674 -0.777,0 0.388,0.673 -0.388,0.673 0.777,0 L 0,2.694 0.389,2.02 1.166,2.02 0.778,1.347 1.166,0.674 0.389,0.674 0,0 Z m 1.066,1.347 0.317,0.548 0.216,0.375 -0.433,0 -0.633,0 L 0.216,2.819 0,3.194 -0.216,2.819 -0.533,2.27 l -0.633,0 -0.433,0 0.216,-0.375 0.317,-0.548 -0.317,-0.548 -0.216,-0.375 0.433,0 0.633,0 0.316,-0.549 L 0,-0.5 l 0.217,0.375 0.316,0.549 0.633,0 0.434,0 -0.217,0.375 -0.317,0.548 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#CE1126" d="M13.685 13.068c1.15-1.028 2.662-1.658 4.325-1.658 1.646 0 3.145.617 4.291 1.626l10.833-7.854C32.772 5.075 32.397 5 32 5H4c-.411 0-.8.08-1.174.195l10.859 7.873z"/><path fill="#1EB53A" d="M24.038 15.483c.303.751.473 1.569.473 2.427 0 .928-.198 1.809-.548 2.608l11.544 8.369c.304-.564.493-1.2.493-1.887V9c0-.67-.181-1.292-.472-1.847l-11.49 8.33zm-11.999 4.994c-.339-.788-.528-1.655-.528-2.566 0-.842.165-1.644.457-2.383L.456 7.182C.174 7.73 0 8.342 0 9v18c0 .675.183 1.301.478 1.859l11.561-8.382z"/><path fill="#CE1126" d="M22.157 22.916c-1.125.933-2.57 1.495-4.146 1.495-1.593 0-3.051-.575-4.181-1.526L2.881 30.822c.357.104.728.178 1.119.178h28c.377 0 .734-.069 1.079-.166l-10.922-7.918z"/><path fill="#1EB53A" d="M19.077 15.266l.317-.548.216-.375h-1.066l-.317-.548-.216-.375-.217.375-.316.548h-1.067l.217.375.316.548-.316.549-.217.375h1.067l.316.548.217.375.216-.375.317-.548h1.066l-.216-.375z"/><path fill="#CE1126" d="M19.177 14.593H18.4l-.389-.673-.389.673h-.778l.389.673-.389.674h.778l.389.673.389-.673h.777l-.389-.674z"/><path fill="#1EB53A" d="M21.928 19.805l.317-.549.217-.375h-1.067l-.316-.548-.217-.375-.216.375-.317.548h-1.066l.216.375.317.549-.317.548-.216.375h1.066l.317.548.216.376.217-.376.316-.548h1.067l-.217-.375z"/><path fill="#CE1126" d="M20.862 18.458l-.389.673h-.777l.388.674-.388.673h.777l.389.673.389-.673h.778l-.389-.673.389-.674h-.778z"/><path fill="#1EB53A" d="M16.542 20.353l-.316-.548.316-.549.217-.375h-1.066l-.317-.548-.217-.375-.216.375-.317.548H13.56l.216.375.317.549-.317.548-.216.375h1.066l.317.548.216.376.217-.376.317-.548h1.066z"/><path fill="#CE1126" d="M16.326 19.131h-.778l-.389-.673-.388.673h-.778l.389.674-.389.673h.778l.388.673.389-.673h.778l-.389-.673z"/></svg>
\ No newline at end of file