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/1f3de.svg b/public/emoji/1f3de.svg
index d0d38a8a1..940483bd3 100644
--- a/public/emoji/1f3de.svg
+++ b/public/emoji/1f3de.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,36 C 4,36 0,36 0,32 L 0,32 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,28 c 0,0 0,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath48" clipPathUnits="userSpaceOnUse"><path id="path50" 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(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(9,11)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 7,5 6,14 11,16 2.076,0.831 10,0.75 17,-0.25 C 36.4,14.55 27,-4 27,-4 l 0,-11 -36,0 c 0,0 7.373,13.838 9,15"/></g><g transform="translate(18,13)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.621,2.622 3.21,9.21 6,12 1,1 2.497,0.498 3,1 1,1 1,2 2,3 1.581,1.581 6,2 7,2 2.003,0 0,-35 0,-35 l -36,0 c 0,0 -6.454,4.387 0,6 4,1 12.477,5.477 18,11"/></g><g transform="translate(0,13)" id="g40"><path id="path42" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 36,0 0,-15 -37,0 1,15 z"/></g></g></g><g id="g44"><g clip-path="url(#clipPath48)" id="g46"><g transform="translate(28,13)" id="g52"><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 -10,-1 -10,-3 0,-2 4,-2 4,-3 0,-1 -13.917,-3 -14,-7 l 17,0 c 0,2 5,3 5,6 0,3 -7,3 -7,4 0,1 7,2 7,3 L 0,0 Z"/></g><g transform="translate(28,13)" id="g56"><path id="path58" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,5 c 0,7 2,8 2,8 l 1,0 C 3,13 2,12 2,6 L 2,0 0,0 Z"/></g><g transform="translate(11.5303,7.4971)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.103 -0.893,-1.497 -1.996,-1.497 -1.101,0 -1.995,0.394 -1.995,1.497 l 0.499,4.489 c 0,1.102 0.395,0.997 1.496,0.997 1.103,0 1.497,0.105 1.497,-0.997 L 0,0 Z"/></g><g transform="translate(16.2217,10.3418)" id="g64"><path id="path66" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.473,2.975 -4.879,7.236 -6.687,7.236 -1.808,0 -3.214,-4.261 -6.687,-7.236 -1.46,-1.251 -0.765,-1.975 1.236,-1.83 1.784,0.129 3.452,0.534 5.451,0.534 1.999,0 3.667,-0.405 5.451,-0.534 C 0.764,-1.975 1.46,-1.251 0,0"/></g><g transform="translate(15.0938,11.5205)" id="g68"><path id="path70" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.669,2.447 -4.169,5.953 -5.559,5.953 -1.389,0 -2.89,-3.506 -5.559,-5.953 -2.121,-1.944 2.78,-2.382 5.559,0 2.778,-2.382 7.68,-1.944 5.559,0"/></g><g transform="translate(15.0938,13.5029)" id="g72"><path id="path74" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.669,2.287 -4.169,5.562 -5.559,5.562 -1.389,0 -2.89,-3.275 -5.559,-5.562 -2.121,-1.816 2.78,-2.224 5.559,0 2.778,-2.224 7.68,-1.816 5.559,0"/></g><g transform="translate(13.875,15.127)" id="g76"><path id="path78" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.084,1.785 -3.255,4.342 -4.34,4.342 -5.425,4.342 -6.597,1.785 -8.68,0 -10.336,-1.418 -6.51,-1.736 -4.34,0 -2.171,-1.736 1.655,-1.418 0,0"/></g><g transform="translate(13.875,16.6123)" id="g80"><path id="path82" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.084,1.786 -3.255,4.342 -4.34,4.342 -5.425,4.342 -6.597,1.786 -8.68,0 -10.336,-1.418 -6.51,-1.736 -4.34,0 -2.171,-1.736 1.655,-1.418 0,0"/></g><g transform="translate(13.0371,17.9321)" id="g84"><path id="path86" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.681,1.441 -2.626,3.503 -3.502,3.503 -4.377,3.503 -5.323,1.441 -7.005,0 -8.341,-1.145 -5.254,-1.402 -3.502,0 -1.751,-1.402 1.337,-1.145 0,0"/></g><g transform="translate(13.0371,19.0503)" id="g88"><path id="path90" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.681,1.441 -2.626,3.504 -3.502,3.504 -4.377,3.504 -5.323,1.441 -7.005,0 -8.341,-1.145 -5.254,-1.402 -3.502,0 -1.751,-1.402 1.337,-1.145 0,0"/></g><g transform="translate(12.2002,20.6958)" id="g92"><path id="path94" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.28,1.097 -1.999,2.667 -2.666,2.667 -3.332,2.667 -4.051,1.097 -5.331,0 -6.347,-0.871 -3.999,-1.066 -2.666,0 -1.333,-1.066 1.017,-0.871 0,0"/></g><g transform="translate(12.2002,21.2925)" id="g96"><path id="path98" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.28,1.096 -1.999,2.666 -2.666,2.666 -3.332,2.666 -4.051,1.096 -5.331,0 -6.347,-0.872 -3.999,-1.067 -2.666,0 -1.333,-1.067 1.017,-0.872 0,0"/></g><g transform="translate(11.3135,32.3218)" id="g100"><path id="path102" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.274,0 -0.539,-0.042 -0.787,-0.119 -0.296,0.844 -1.096,1.45 -2.04,1.45 -1.013,0 -1.861,-0.697 -2.096,-1.637 C -5.173,-0.117 -5.481,0 -5.821,0 c -0.827,0 -1.497,-0.67 -1.497,-1.497 0,-0.201 0.041,-0.391 0.114,-0.566 -0.144,0.04 -0.292,0.067 -0.446,0.067 -0.919,0 -1.664,-0.744 -1.664,-1.663 0,-0.919 0.745,-1.663 1.664,-1.663 l 7.65,0 c 1.469,0 2.661,1.192 2.661,2.661 C 2.661,-1.191 1.469,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M36 25V4s0-4-4-4H4S0 0 0 4v20.922L36 25z"/><path fill="#292F33" d="M27 10h-5l-5 14h19V5c-1 0-5.419.419-7 2-1 1-1 2-2 3z"/><path fill="#66757F" d="M24 11c1-1 2.497-.498 3-1 .51-.51.76-1.019 1.015-1.529-3.737-.121-6.83.055-8.015.529-5 2-4 11-11 16 0 0 5 1.999 9-2 2.621-2.622 3.21-9.21 6-12z"/><path fill="#5C913B" d="M4 36h28c4 0 4-4 4-4v-9H0v9c0 4 4 4 4 4z"/><path fill="#55ACEE" d="M28 23c0 1-10 1-10 3s4 2 4 3-13.917 3-14 7h17c0-2 5-3 5-6s-7-3-7-4 7-2 7-3h-2z"/><path fill="#269" d="M28 23v-5c0-7 2-8 2-8h1s-1 1-1 7v6h-2z"/><path fill="#662113" d="M11.53 28.503c0 1.103-.893 1.497-1.996 1.497-1.102 0-1.996-.395-1.996-1.497l.499-4.489c0-1.102.395-.997 1.497-.997 1.103 0 1.497-.104 1.497.997l.499 4.489z"/><path fill="#3E721D" d="M16.222 25.658c-.252-.216-.49-.44-.721-.667-.082-.158-.203-.325-.406-.512-.179-.164-.352-.334-.521-.506 1.02-.146 1.46-.672.521-1.476-.307-.263-.597-.54-.875-.823.122-.199.044-.468-.344-.801-.128-.109-.252-.222-.373-.336.773-.12 1.096-.53.373-1.149-.221-.19-.43-.389-.632-.592.187-.164.165-.411-.206-.728-.078-.067-.146-.14-.221-.209.562-.113.777-.433.221-.91-.352-.302-.666-.632-.96-.964.379-.091.515-.318.156-.648.263-.117.314-.333-.033-.63-1.28-1.096-1.999-2.666-2.666-2.666s-1.386 1.57-2.665 2.666c-.347.298-.296.514-.033.63-.359.33-.223.557.156.648-.294.332-.608.662-.96.964-.556.477-.341.796.221.91-.075.069-.143.142-.221.209-.371.318-.393.564-.206.728-.202.203-.41.402-.632.592-.723.619-.4 1.029.373 1.149-.121.115-.245.227-.373.336-.388.333-.467.602-.344.801-.278.283-.568.56-.875.823-.939.804-.499 1.331.521 1.476-.169.172-.342.342-.521.506-.203.186-.324.354-.406.511-.231.228-.47.452-.722.668-1.459 1.251-.765 1.975 1.236 1.83 1.784-.129 3.452-.534 5.451-.534s3.667.405 5.451.534c2 .145 2.696-.579 1.236-1.83z"/><path fill="#F5F8FA" d="M11.314 3.678c-.274 0-.539.042-.787.119-.296-.843-1.096-1.449-2.04-1.449-1.013 0-1.86.697-2.096 1.637-.25-.189-.559-.306-.898-.306-.827 0-1.497.67-1.497 1.497 0 .201.041.392.114.567-.144-.04-.292-.068-.446-.068C2.744 5.674 2 6.418 2 7.337 2 8.256 2.744 9 3.663 9h7.65c1.469 0 2.661-1.191 2.661-2.661.001-1.469-1.192-2.661-2.66-2.661z"/></svg>
\ No newline at end of file