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/1f365.svg b/public/emoji/1f365.svg
index bd9130486..fd448da06 100644
--- a/public/emoji/1f365.svg
+++ b/public/emoji/1f365.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(22.2354,0.3379)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.418,0 -0.83,0.123 -1.182,0.361 L -4.142,2.368 -7.101,0.361 C -7.454,0.123 -7.867,0 -8.284,0 -8.467,0 -8.649,0.022 -8.831,0.072 -9.42,0.229 -9.915,0.635 -10.181,1.186 l -1.721,2.392 -3.405,0.568 c -0.05,-0.003 -0.1,-0.004 -0.151,-0.004 -0.558,0 -1.095,0.221 -1.49,0.617 -0.433,0.435 -0.658,1.032 -0.614,1.641 l 0.256,3.568 -3.215,1.56 c -0.55,0.266 -0.957,0.762 -1.116,1.353 -0.159,0.591 -0.052,1.221 0.291,1.728 l 1.152,2.928 -1.152,2.991 c -0.343,0.507 -0.45,1.137 -0.291,1.729 0.159,0.59 0.566,1.084 1.116,1.351 l 3.215,1.56 -0.256,3.565 c -0.044,0.612 0.181,1.212 0.614,1.642 0.394,0.397 0.932,0.618 1.49,0.618 0.051,0 0.101,0 0.151,-0.004 l 3.28,0.506 1.846,2.452 c 0.266,0.551 0.761,0.958 1.35,1.116 0.182,0.048 0.364,0.073 0.547,0.073 0.417,0 0.83,-0.124 1.183,-0.363 l 2.959,-2.005 2.96,2.005 c 0.352,0.239 0.764,0.363 1.182,0.363 0.183,0 0.369,-0.025 0.545,-0.073 0.592,-0.158 1.088,-0.565 1.353,-1.116 L 3.765,31.62 7.026,30.989 c 0.048,0.004 0.1,0.004 0.149,0.004 0.557,0 1.094,-0.221 1.493,-0.618 0.431,-0.43 0.656,-1.03 0.612,-1.642 l -0.259,-3.565 3.22,-1.56 c 0.551,-0.267 0.957,-0.761 1.113,-1.351 0.159,-0.592 0.055,-1.223 -0.289,-1.729 L 12.14,17.62 13.065,14.609 c 0.344,-0.507 0.448,-1.137 0.289,-1.728 -0.156,-0.591 -0.562,-1.087 -1.113,-1.353 L 9.021,9.968 9.28,6.4 C 9.324,5.791 9.099,5.194 8.668,4.759 8.269,4.363 7.732,4.142 7.175,4.142 7.126,4.142 7.074,4.143 7.026,4.146 L 3.807,3.62 1.898,1.186 C 1.633,0.635 1.137,0.229 0.545,0.072 0.368,0.022 0.183,0 0,0"/></g><g transform="translate(18.5,7.291)" id="g24"><path id="path26" style="fill:#d372b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.708,-0.041 -8.167,2.875 -7.792,8.37 0.133,1.959 0.902,3.779 2.341,5.116 2.543,2.366 6.538,2.22 8.903,-0.324 0.987,-1.061 1.5,-2.443 1.447,-3.891 C 4.848,7.824 4.234,6.483 3.173,5.497 2.255,4.644 1.069,4.195 -0.192,4.244 -1.445,4.29 -2.605,4.821 -3.458,5.739 c -0.785,0.844 -1.059,2.045 -0.733,3.214 0.331,1.189 1.218,2.095 2.375,2.425 0.532,0.152 1.123,0.236 1.274,-0.294 0.152,-0.531 -0.38,-0.757 -1.083,-1.25 C -2.458,9.25 -2.917,8.167 -1.993,7.101 -1.522,6.557 -0.838,6.27 -0.12,6.243 0.597,6.22 1.285,6.472 1.812,6.962 2.48,7.584 2.868,8.431 2.901,9.345 2.935,10.258 2.609,11.13 1.987,11.8 0.373,13.537 -2.353,13.637 -4.09,12.021 -5.136,11.048 -5.742,9.726 -5.794,8.298 -5.846,6.869 -5.338,5.507 -4.365,4.46 -3.163,3.167 -1.53,2.42 0.234,2.355 1.998,2.285 3.682,2.917 4.975,4.12 6.562,5.596 7.48,7.603 7.56,9.769 c 0.079,2.166 -0.691,4.234 -2.167,5.821 -3.725,4.008 -8.601,4.952 -13.643,1.911 -0.763,-0.461 -1.401,-1.137 -1.833,-0.792 -0.209,0.167 -0.315,0.481 0.09,0.857 4.815,4.478 12.376,4.201 16.85,-0.614 C 8.697,14.974 9.776,12.39 9.558,9.695 8.875,1.292 3,-0.166 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M22.235 35.662c-.418 0-.83-.123-1.182-.361l-2.96-2.007-2.959 2.007c-.354.238-.766.361-1.184.361-.183 0-.365-.023-.546-.072-.589-.156-1.084-.562-1.351-1.113l-1.721-2.393-3.405-.568c-.05.003-.101.005-.151.005-.558 0-1.096-.222-1.491-.617-.433-.435-.657-1.032-.614-1.642l.256-3.567-3.215-1.56c-.551-.266-.958-.762-1.116-1.353-.159-.591-.053-1.221.291-1.729l1.152-2.928-1.152-2.991c-.343-.507-.45-1.137-.291-1.729.159-.589.565-1.084 1.116-1.351l3.215-1.561-.254-3.564c-.043-.612.181-1.212.614-1.642.395-.397.933-.618 1.491-.618.05 0 .101 0 .151.004l3.28-.506 1.846-2.452c.267-.551.761-.958 1.351-1.116.181-.048.363-.073.546-.073.418 0 .83.125 1.184.363l2.959 2.005 2.96-2.005c.352-.239.764-.363 1.182-.363.183 0 .369.025.545.073.592.159 1.088.565 1.354 1.116L26 4.042l3.262.631c.048-.004.1-.004.149-.004.558 0 1.094.221 1.493.618.431.43.656 1.03.612 1.642l-.26 3.565 3.221 1.561c.551.267.957.761 1.113 1.351.158.592.055 1.223-.289 1.729l-.926 2.908.926 3.011c.344.508.447 1.138.289 1.729-.156.591-.562 1.087-1.113 1.353l-3.221 1.56.26 3.567c.044.609-.182 1.206-.612 1.642-.399.396-.935.617-1.493.617-.049 0-.101-.002-.149-.005l-3.22.526-1.908 2.435c-.266.551-.762.957-1.354 1.113-.176.049-.362.071-.545.071z"/><path fill="#D372B8" d="M18.5 28.709c-3.708.041-8.167-2.875-7.792-8.37.133-1.959.903-3.779 2.341-5.116 2.543-2.365 6.538-2.219 8.903.324.986 1.061 1.5 2.443 1.447 3.891-.052 1.447-.665 2.788-1.727 3.774-.918.853-2.104 1.302-3.365 1.253-1.253-.046-2.413-.577-3.266-1.495-.785-.844-1.059-2.045-.733-3.214.331-1.188 1.219-2.095 2.375-2.425.532-.151 1.123-.236 1.275.294.152.531-.38.757-1.083 1.25-.833.584-1.292 1.667-.368 2.733.471.544 1.155.831 1.874.857.716.024 1.405-.228 1.931-.719.669-.622 1.057-1.469 1.09-2.383.033-.914-.292-1.786-.914-2.456-1.615-1.736-4.34-1.836-6.077-.221-1.046.973-1.652 2.295-1.704 3.724-.052 1.429.455 2.791 1.428 3.838 1.202 1.293 2.835 2.04 4.6 2.104 1.764.07 3.447-.562 4.74-1.765 1.588-1.476 2.506-3.483 2.585-5.649.079-2.167-.691-4.234-2.167-5.822-3.725-4.008-8.601-4.952-13.643-1.91-.763.463-1.401 1.139-1.833.794-.208-.167-.314-.481.09-.857 4.815-4.478 12.376-4.201 16.851.614 1.84 1.979 2.919 4.562 2.7 7.257-.683 8.403-6.558 9.861-9.558 9.695z"/></svg>
\ No newline at end of file