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/1f57a-1f3fd.svg b/public/emoji/1f57a-1f3fd.svg
index b2e430355..14e536b4f 100644
--- a/public/emoji/1f57a-1f3fd.svg
+++ b/public/emoji/1f57a-1f3fd.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(21.8262,0.3389)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.154,0.19 -0.249,0.433 -0.249,0.698 -0.253,1.315 0.244,1.816 0.86,1.819 L 4.03,1.835 C 4.645,1.836 5.147,1.343 5.149,0.726 5.153,0.108 4.658,-0.393 4.041,-0.395 L 0.872,-0.412 C 0.521,-0.413 0.206,-0.253 0,0"/></g><g transform="translate(7.3203,0.3389)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.154,0.19 -0.248,0.433 -0.248,0.698 -0.004,0.617 0.493,1.118 1.109,1.121 l 3.17,0.016 C 4.644,1.836 5.148,1.343 5.15,0.726 5.154,0.108 4.658,-0.393 4.041,-0.395 L 0.872,-0.412 C 0.521,-0.413 0.208,-0.253 0,0"/></g><g transform="translate(28.1514,26.9932)" id="g28"><path id="path30" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.423,0.35 -0.535,0.964 -0.24,1.441 l 2.247,1.63 C 2.506,3.434 3.203,3.323 3.568,2.825 3.925,2.324 3.816,1.63 3.319,1.267 L 1.662,0.275 C 1.339,-0.249 0.652,-0.415 0.127,-0.093 0.081,-0.063 0.038,-0.034 0,0"/></g><g transform="translate(28.6484,29.3325)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.044,-2.58 -5.079,-0.429 c 0,0 -6.822,-0.855 -9.048,-1.472 -3.818,-1.058 -1.925,-3.991 -1.925,-3.991 l 2.584,-4.167 1.322,1.723 -1.736,3.708 4.871,0.907 4.001,-0.544 6.614,1.754 3.905,2.755 L 0,0 Z"/></g><g transform="translate(20.3359,30.6465)" id="g36"><path id="path38" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.848 -1.31,3.347 -2.927,3.347 -1.618,0 -2.929,-1.499 -2.929,-3.347 0,-1.433 0.791,-2.646 1.898,-3.123 l 0.253,-2.498 c 0.062,-0.613 0.608,-1.06 1.223,-0.997 0.613,0.061 1.058,0.609 0.997,1.221 l -0.238,2.352 C -0.709,-2.519 0,-1.357 0,0"/></g><g transform="translate(18.9824,32.9248)" id="g40"><path id="path42" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.14,-1.07 -2.349,-1.255 0,0 -0.723,-1.172 -0.768,-1.848 0,0 -0.45,1.081 -0.81,0.9 -0.36,-0.179 -0.495,-0.855 -0.18,-1.304 0.315,-0.451 0.705,-1.226 0.363,-1.003 -0.689,0.45 -0.79,0.767 -0.976,1.07 -0.126,0.206 -0.425,0.942 -0.465,2.161 -0.023,0.721 0.233,2.116 1.708,2.857 1.278,0.644 3.287,0.316 4.231,-0.359 0.945,-0.676 1.18,-2.381 0.594,-3.056 0,0 -0.085,0.63 -0.489,1.14 C 0.634,-0.414 0,0 0,0"/></g><g transform="translate(13.5,25.4687)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.257,-3.954 -0.29,-8.34 0.968,0.009 7.373,0.024 7.373,0.024 0,0 1.156,2.032 0.994,4.212 C 7.916,-1.923 7.038,0.711 7.038,0.711 L 5.956,0.819 5.744,1.83 4.688,1.43 4.537,-0.32 4.081,1.345 2.534,1.48 2.349,0.414 0,0 Z"/></g><g transform="translate(12.874,25.3491)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.689,-2.443 0.385,-7.5 2.228,0.038 3.964,0.732 3.964,0.732 0,0 0.146,1.919 -0.228,3.615 C 3.575,-0.684 3.016,0.769 3.016,0.769 L 0,0 Z"/></g><g transform="translate(19.3896,26.5952)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.623,-3.271 0.484,-5.224 0.345,-7.177 0.249,-7.918 0.249,-7.918 c 0,0 0.35,-0.321 1.479,-0.301 0.466,1.222 0.842,3.514 0.786,5.018 -0.06,1.585 -1.002,3.128 -1.002,3.128 L 0,0 Z"/></g><g transform="translate(13.2095,17.1284)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.682,-5.616 -1.425,-7.124 -0.79,-2.58 -4.54,-8.369 -4.54,-8.369 l 2.527,-0.585 c 0,0 4.298,4.64 5.43,6.582 1.212,2.185 2.2,5.511 2.2,5.511 0,0 2.576,-2.266 3.727,-3.958 0.728,-2.003 0.449,-8.148 0.449,-8.148 l 3.028,0.013 c 0,0 1.545,6.365 0.288,9.575 -0.603,1.558 -4.31,6.527 -4.31,6.527 L 0,0 Z"/></g><g transform="translate(14.7305,15.8916)" id="g60"><path id="path62" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.27,-0.476 -0.854,-0.692 -1.376,-0.487 L -3.594,0.802 -2.272,2.525 -0.559,1.59 C 0.014,1.363 0.295,0.717 0.07,0.143 0.05,0.092 0.027,0.045 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M21.826 35.661c-.154-.19-.249-.433-.249-.698-.004-.617.493-1.118 1.109-1.121l3.17-.016c.614-.001 1.117.492 1.119 1.109.004.617-.491 1.118-1.108 1.121l-3.169.017c-.35.001-.666-.159-.872-.412zm-14.506 0c-.154-.19-.248-.433-.248-.698-.004-.617.493-1.118 1.109-1.121l3.17-.016c.613-.001 1.117.492 1.119 1.109.004.617-.493 1.118-1.109 1.121l-3.169.017c-.35.001-.664-.159-.872-.412z"/><path fill="#D5AB88" d="M28.151 9.007c-.423-.35-.535-.964-.24-1.441l2.247-1.63c.499-.363 1.196-.252 1.562.247.356.501.248 1.194-.249 1.558l-1.657.991c-.323.524-1.01.69-1.535.368-.047-.03-.089-.059-.128-.093z"/><path fill="#292F33" d="M28.648 6.667l-4.044 2.58-5.079.429s-6.822.855-9.048 1.472c-3.818 1.058-1.925 3.991-1.925 3.991l2.583 4.167 1.322-1.723-1.736-3.708 4.871-.906 4.001.544 6.613-1.754 3.905-2.755-1.463-2.337z"/><path fill="#D5AB88" d="M20.336 5.354c0-1.848-1.309-3.347-2.927-3.347S14.48 3.506 14.48 5.354c0 1.433.791 2.646 1.899 3.123l.253 2.498c.062.613.608 1.06 1.222.997.613-.061 1.059-.609.997-1.221l-.238-2.353c1.014-.526 1.723-1.688 1.723-3.044z"/><path fill="#963B22" d="M18.982 3.075s-1.14 1.07-2.349 1.255c0 0-.723 1.171-.768 1.847 0 0-.45-1.081-.81-.9-.36.18-.496.855-.18 1.305.315.451.705 1.226.363 1.003-.689-.45-.79-.768-.976-1.07-.127-.206-.425-.943-.465-2.162-.024-.721.232-2.116 1.707-2.857 1.278-.644 3.287-.315 4.231.359.945.676 1.18 2.38.594 3.056 0 0-.085-.63-.488-1.14-.225-.282-.859-.696-.859-.696z"/><path fill="#DD2E44" d="M13.5 10.531s.257 3.954-.29 8.34c.968-.009 7.373-.024 7.373-.024s1.156-2.033.994-4.213c-.161-2.181-1.039-4.815-1.039-4.815l-1.082-.108-.212-1.011-1.056.4-.151 1.751-.456-1.666-1.548-.135-.185 1.066-2.348.415z"/><path fill="#292F33" d="M12.874 10.651s.689 2.443.385 7.5c2.228-.038 3.963-.732 3.963-.732s.146-1.919-.228-3.615c-.546-2.469-1.105-3.921-1.105-3.921l-3.015.768zm6.516-1.246s.623 3.271.484 5.224c-.14 1.953-.235 2.694-.235 2.694s.35.32 1.479.3c.467-1.222.843-3.514.786-5.018-.059-1.585-1.002-3.127-1.002-3.127l-1.512-.073zm-6.18 9.467s-.682 5.616-1.425 7.125c-.79 2.579-4.54 8.368-4.54 8.368l2.527.585s4.298-4.64 5.43-6.582c1.212-2.185 2.2-5.511 2.2-5.511s2.576 2.267 3.728 3.958c.727 2.003.448 8.148.448 8.148l3.028-.014s1.545-6.364.288-9.574c-.604-1.559-4.311-6.527-4.311-6.527l-7.373.024z"/><path fill="#D5AB88" d="M14.731 20.108c-.27.476-.854.692-1.376.487l-2.218-1.289 1.322-1.723 1.713.935c.573.226.854.873.629 1.447-.021.052-.044.098-.07.143z"/></svg>
\ No newline at end of file