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/1f6b3.svg b/public/emoji/1f6b3.svg
index 0b1eee970..ab08b6bb2 100644
--- a/public/emoji/1f6b3.svg
+++ b/public/emoji/1f6b3.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(34.999,18.001)" id="g20"><path id="path22" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.389 -7.611,-17 -17,-17 -9.389,0 -16.999,7.611 -16.999,17 0,9.389 7.61,16.999 16.999,16.999 9.389,0 17,-7.61 17,-16.999"/></g><g transform="translate(27,9)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.418,0 -4.436,1.718 -4.899,4 L 0,4 0.001,4 C 0.117,4 0.231,4.028 0.344,4.069 0.378,4.082 0.408,4.097 0.44,4.112 0.472,4.129 0.506,4.137 0.537,4.156 0.567,4.176 0.585,4.207 0.612,4.229 0.667,4.273 0.716,4.317 0.76,4.371 0.801,4.42 0.834,4.47 0.864,4.525 0.895,4.581 0.919,4.636 0.939,4.697 0.961,4.764 0.973,4.829 0.98,4.898 0.983,4.934 1,4.964 1,5 1,5.027 0.986,5.051 0.984,5.078 0.98,5.146 0.964,5.21 0.944,5.276 0.925,5.342 0.904,5.402 0.873,5.462 0.86,5.486 0.858,5.514 0.844,5.537 L -1.779,9.659 C -1.225,9.871 -0.629,10 0,10 2.762,10 5,7.762 5,5 5,2.238 2.762,0 0,0 m -18,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 0.203,0 0.396,-0.036 0.592,-0.06 l -1.541,-4.624 c -0.175,-0.524 0.108,-1.09 0.632,-1.264 C -18.212,4.017 -18.105,4 -18,4 c 0.418,0 0.809,0.265 0.948,0.684 l 1.543,4.628 C -14.016,8.447 -13,6.85 -13,5 -13,2.238 -15.239,0 -18,0 m 3.721,13 5.074,0 -2.111,-5.913 c -0.569,1.822 -1.866,3.319 -3.546,4.164 L -14.279,13 Z m 7.358,-7 -2.66,0 2.5,7 0.805,0 1.715,-2.697 C -5.812,9.226 -6.675,7.714 -6.921,6 M -3.47,8.589 -1.822,6 -4.899,6 c 0.205,1.008 0.717,1.901 1.429,2.589 M 0,12 c -1.025,0 -1.996,-0.226 -2.873,-0.622 l -3.066,4.818 0.03,0.085 2.203,-0.275 C -3.676,16.002 -3.647,16 -3.617,16 c 0.302,0 0.575,0.192 0.672,0.485 l 0.709,2.127 c 0.095,0.287 -0.002,0.603 -0.241,0.788 -0.243,0.183 -0.575,0.194 -0.825,0.026 -1.922,-1.281 -5.948,-1.299 -5.989,-1.299 -0.374,-10e-4 -0.684,-0.291 -0.707,-0.665 -0.023,-0.374 0.248,-0.701 0.62,-0.748 L -7.942,16.535 -8.491,15 l -6.176,0 -3.733,2.8 c -0.443,0.332 2.223,-4.167 2.223,-4.167 L -16.76,11.884 C -17.163,11.956 -17.576,12 -18,12 c -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.53,0 6.442,2.615 6.922,6.014 C -11.052,4.012 -11.026,4 -11,4 l 4.079,0 C -6.434,0.609 -3.524,-2 0,-2 3.867,-2 7,1.134 7,5 7,8.866 3.867,12 0,12"/></g><g transform="translate(9,27)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 5,0 C 5.552,0 6,0.448 6,1 6,1.552 5.552,2 5,2 L 0,2 C -0.552,2 -1,1.552 -1,1 -1,0.448 -0.552,0 0,0"/></g><g transform="translate(2,17.9995)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3.968 1.453,7.592 3.845,10.388 L 26.388,-12.156 C 23.592,-14.547 19.968,-15.999 16,-15.999 7.164,-15.999 0,-8.836 0,0 m 32,0 c 0,-3.968 -1.453,-7.591 -3.845,-10.388 L 5.612,12.155 C 8.409,14.547 12.032,16 16,16 24.837,16 32,8.836 32,0 M 16,18 C 6.059,18 -2,9.941 -2,0 c 0,-9.941 8.059,-17.999 18,-17.999 9.941,0 18,8.058 18,17.999 0,9.941 -8.059,18 -18,18"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M34.999 17.999c0 9.389-7.611 17-17 17S1 27.388 1 17.999 8.61 1 17.999 1s17 7.61 17 16.999z"/><g fill="#FFF"><path d="M27 15c-1.025 0-1.996.226-2.873.622l-3.067-4.818.03-.085 2.203.275c.031.004.06.006.09.006.302 0 .575-.192.672-.485l.709-2.127c.096-.287-.002-.604-.241-.788-.242-.184-.574-.194-.824-.026-1.922 1.281-5.948 1.299-5.989 1.299-.374 0-.684.291-.707.665-.024.374.248.701.62.748l1.435.179L18.509 12h-6.177L8.6 9.2c-.443-.332 2.223 4.167 2.223 4.167l-.583 1.749C9.837 15.044 9.424 15 9 15c-3.866 0-7 3.134-7 7s3.134 7 7 7c3.53 0 6.442-2.615 6.922-6.014.026.002.052.014.078.014h4.079c.487 3.391 3.396 6 6.921 6 3.867 0 7-3.134 7-7s-3.133-7-7-7zm-3.47 3.411L25.178 21h-3.077c.205-1.008.717-1.901 1.429-2.589zM20.079 21h-2.66l2.5-7h.805l1.716 2.697c-1.252 1.077-2.115 2.589-2.361 4.303zm-7.358-7h5.074l-2.111 5.913c-.568-1.822-1.865-3.319-3.546-4.164L12.721 14zM9 27c-2.761 0-5-2.238-5-5s2.239-5 5-5c.203 0 .396.036.592.06l-1.541 4.624c-.175.524.108 1.091.632 1.265.105.034.212.051.317.051.419 0 .809-.265.949-.684l1.543-4.628C12.984 18.553 14 20.15 14 22c0 2.762-2.239 5-5 5zm18 0c-2.418 0-4.435-1.718-4.899-4h4.9c.116 0 .23-.028.343-.069.034-.013.064-.027.097-.043.031-.017.066-.024.097-.044.03-.02.048-.051.075-.072.055-.044.103-.089.147-.143.041-.049.074-.099.104-.154.03-.056.055-.11.075-.172.021-.066.033-.132.04-.201.004-.036.021-.066.021-.102 0-.027-.014-.051-.016-.078-.005-.067-.021-.132-.04-.198-.019-.065-.04-.126-.071-.186-.013-.024-.015-.052-.029-.075l-2.623-4.122C25.775 17.129 26.371 17 27 17c2.762 0 5 2.238 5 5s-2.238 5-5 5z"/><path d="M9 9h5c.552 0 1-.448 1-1s-.448-1-1-1H9c-.552 0-1 .448-1 1s.448 1 1 1z"/></g><path fill="#DD2E44" d="M18 0C8.059 0 0 8.06 0 18c0 9.941 8.059 18 18 18s18-8.059 18-18c0-9.94-8.059-18-18-18zm16 18c0 3.968-1.453 7.591-3.845 10.388L7.612 5.845C10.409 3.453 14.032 2 18 2c8.837 0 16 7.164 16 16zM2 18c0-3.968 1.453-7.592 3.845-10.388l22.543 22.544C25.592 32.548 21.968 34 18 34 9.164 34 2 26.837 2 18z"/></svg>
\ No newline at end of file