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/1f239.svg b/public/emoji/1f239.svg
index a85431feb..889c02726 100644
--- a/public/emoji/1f239.svg
+++ b/public/emoji/1f239.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(36,4)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(29.2461,8.6182)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.689 -0.858,-2.47 -2.887,-2.47 -0.832,0 -2.002,0.078 -2.73,0.234 -0.363,0.078 -0.623,0.416 -0.623,0.858 0,0.105 0,0.183 0.025,0.286 0.104,0.52 0.416,0.78 0.807,0.78 0.052,0 0.129,0 0.181,-0.026 0.598,-0.13 1.508,-0.234 2.081,-0.234 0.988,0 1.169,0.182 1.169,1.041 l 0,19.813 c 0,0.493 0.39,0.779 0.989,0.779 C -0.391,21.061 0,20.775 0,20.282 L 0,0 Z m -4.889,4.03 c 0,-0.494 -0.416,-0.727 -0.988,-0.727 -0.546,0 -0.988,0.26 -0.988,0.727 l 0,14.951 c 0,0.495 0.442,0.728 0.988,0.728 0.572,0 0.988,-0.259 0.988,-0.728 l 0,-14.951 z m -7.67,-4.602 c 0.494,0 0.728,0.131 0.728,0.625 l 0,2.912 c 0,0.519 -0.234,0.649 -0.728,0.649 l -6.032,0 c -0.494,0 -0.728,-0.13 -0.728,-0.649 l 0,-2.912 c 0,-0.494 0.234,-0.625 0.728,-0.625 l 6.032,0 z m 0.598,5.772 c 1.456,0 2.08,-0.546 2.08,-1.975 l 0,-3.433 c 0,-1.43 -0.624,-1.976 -2.08,-1.976 l -7.202,0 c -1.456,0 -2.107,0.546 -2.107,1.976 l 0,3.433 c 0,1.429 0.651,1.975 2.107,1.975 l 7.202,0 z m 1.638,14.015 c 1.378,0 2.028,-0.571 2.028,-1.976 l 0,-1.69 c 0,-0.572 -0.363,-0.78 -0.91,-0.78 -0.546,0 -0.884,0.234 -0.884,0.702 l 0,1.456 c 0,0.52 -0.26,0.651 -0.728,0.651 l -9.308,0 c -0.494,0 -0.729,-0.131 -0.729,-0.651 l 0,-1.742 c 0,-0.468 -0.416,-0.727 -0.935,-0.727 -0.521,0 -0.91,0.233 -0.91,0.805 l 0,1.976 c 0,1.405 0.65,1.976 2.028,1.976 l 4.238,0 0,1.405 c 0,0.467 0.39,0.728 0.988,0.728 0.624,0 1.014,-0.261 1.014,-0.728 l 0,-1.405 4.108,0 z m -10.4,-8.918 c -0.416,0 -0.65,0.364 -0.65,0.78 0,0.416 0.234,0.78 0.65,0.78 l 4.394,0 0,1.794 -3.484,0 c -0.468,0 -0.65,0.338 -0.65,0.78 0,0.416 0.234,0.754 0.65,0.754 l 3.484,0 0,1.222 c 0,0.469 0.338,0.702 0.858,0.702 0.546,0 0.858,-0.233 0.858,-0.702 l 0,-1.222 3.588,0 c 0.416,0 0.65,-0.338 0.65,-0.754 0,-0.442 -0.182,-0.78 -0.65,-0.78 l -3.588,0 0,-1.794 4.264,0 c 0.39,0 0.65,-0.364 0.65,-0.78 0,-0.416 -0.26,-0.78 -0.65,-0.78 l -4.264,0 0,-1.846 5.616,0 c 0.39,0 0.624,-0.339 0.624,-0.806 0,-0.416 -0.234,-0.781 -0.624,-0.781 l -13.313,0 c -0.416,0 -0.624,0.365 -0.624,0.781 0,0.467 0.208,0.806 0.624,0.806 l 5.981,0 0,1.846 -4.394,0 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M8.523 17.084c-.416 0-.65-.364-.65-.78 0-.416.234-.78.65-.78h4.394V13.73H9.433c-.468 0-.65-.338-.65-.78 0-.416.234-.754.65-.754h3.484v-1.222c0-.468.338-.702.858-.702.546 0 .858.234.858.702v1.222h3.588c.416 0 .65.338.65.754 0 .442-.182.78-.65.78h-3.588v1.794h4.265c.39 0 .649.364.649.78 0 .416-.26.78-.649.78h-4.265v1.846h5.616c.39 0 .624.339.624.807 0 .416-.234.78-.624.78H6.937c-.416 0-.624-.364-.624-.78 0-.468.208-.807.624-.807h5.98v-1.846H8.523zm10.4-8.917c1.378 0 2.028.572 2.028 1.976v1.69c0 .572-.363.78-.91.78-.546 0-.884-.234-.884-.702v-1.456c0-.52-.26-.65-.728-.65H9.121c-.494 0-.729.13-.729.65v1.742c0 .468-.416.727-.936.727-.521 0-.91-.234-.91-.806v-1.976c0-1.404.65-1.976 2.028-1.976h4.238V6.762c0-.468.39-.728.988-.728.624 0 1.014.26 1.014.728v1.404h4.109zm-1.638 14.015c1.456 0 2.08.546 2.08 1.976v3.433c0 1.43-.624 1.976-2.08 1.976h-7.202c-1.456 0-2.106-.546-2.106-1.976v-3.433c0-1.43.65-1.976 2.106-1.976h7.202zm-.598 5.772c.494 0 .728-.131.728-.625v-2.912c0-.52-.234-.649-.728-.649h-6.032c-.494 0-.728.13-.728.649v2.912c0 .494.234.625.728.625h6.032zm7.67-4.602c0 .494-.416.727-.988.727-.546 0-.988-.26-.988-.727V8.4c0-.494.442-.728.988-.728.572 0 .988.26.988.728v14.952zm4.889 4.03c0 1.69-.858 2.47-2.887 2.47-.832 0-2.002-.078-2.73-.233-.363-.078-.623-.416-.623-.858 0-.104 0-.183.025-.286.104-.52.416-.78.807-.78.052 0 .129 0 .182.026.598.13 1.508.234 2.08.234.988 0 1.17-.183 1.17-1.041V7.1c0-.494.39-.78.988-.78s.988.286.988.78v20.282z"/></svg>
\ No newline at end of file