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/1f33e.svg b/public/emoji/1f33e.svg
index ce4151b06..320f1498e 100644
--- a/public/emoji/1f33e.svg
+++ b/public/emoji/1f33e.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.3877,35.3804)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.852,0 -4.235,-1.849 -6.22,-4.826 -2.321,-3.483 -1.069,-5.988 -0.062,-8.002 0.155,-0.31 0.459,-0.517 0.805,-0.548 0.03,-0.003 0.06,-0.004 0.089,-0.004 0.313,0 0.611,0.147 0.8,0.4 2.395,3.192 6.211,8.196 6.907,8.893 C 2.507,-3.9 2.612,-3.646 2.612,-3.38 2.612,-0.888 1.263,0 0,0"/></g><g transform="translate(23.7656,26.3853)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.21,0 -2.575,-1.132 -4.565,-3.785 -2.124,-2.832 -2.462,-5.314 -1.095,-8.048 0.151,-0.301 0.444,-0.506 0.779,-0.545 0.039,-0.005 0.077,-0.007 0.115,-0.007 0.295,0 0.578,0.131 0.769,0.359 1.719,2.064 5.173,6.168 5.938,6.934 0.188,0.187 0.293,0.442 0.293,0.707 C 2.234,-3.301 2.234,0 0,0"/></g><g transform="translate(29.874,24.4829)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.268,0.482 -0.878,0.654 -1.359,0.385 -7.171,-3.983 -13.784,-14.15 -16.367,-19.609 0.838,10.195 5.569,20.044 13.559,28.034 0.391,0.391 0.391,1.024 0,1.414 -0.391,0.391 -1.023,0.391 -1.414,0 -7.963,-7.963 -12.827,-17.717 -14.005,-27.881 -0.674,5.698 -0.977,13.91 1.626,19.768 0.224,0.505 -0.003,1.096 -0.508,1.32 -0.505,0.226 -1.096,-0.003 -1.32,-0.508 -1.325,-2.983 -1.945,-6.501 -2.161,-10.008 -0.885,1.884 -1.924,3.602 -3.453,3.602 l -0.046,0 c -0.91,0 -1.691,-0.466 -2.321,-1.725 -0.247,-0.495 -0.046,-0.922 0.448,-1.169 0.495,-0.248 1.094,-0.047 1.342,0.447 0.311,0.622 0.524,0.769 0.521,0.792 0.636,-0.196 1.744,-2.696 2.162,-3.642 0.196,-0.443 0.374,-0.842 0.527,-1.15 0.148,-0.296 0.425,-0.478 0.728,-0.529 0.026,-4.957 0.698,-9.531 1.163,-12.091 l 0.02,-0.111 c 0.087,-0.483 0.508,-0.822 0.983,-0.822 0.059,0 0.119,0.005 0.179,0.016 0.122,0.022 0.23,0.071 0.331,0.132 0.147,-0.085 0.308,-0.148 0.491,-0.148 0.183,0 0.344,0.063 0.492,0.148 0.144,-0.085 0.302,-0.148 0.482,-0.148 l 0.025,0 c 0.531,0 0.972,0.448 1.001,0.981 0.057,1.037 2.494,6.013 6.143,11.043 0.103,0.014 0.207,0.033 0.304,0.082 0.244,0.122 0.517,0.272 0.808,0.432 0.933,0.517 2.494,1.38 3.106,1.02 0.15,-0.088 0.639,-0.534 0.639,-2.558 0,-0.553 0.447,-1 1,-1 0.553,0 1,0.447 1,1 0,2.236 -0.53,3.636 -1.622,4.28 -0.783,0.461 -1.668,0.424 -2.54,0.174 2.32,2.715 4.938,5.165 7.647,6.671 C 0.095,-1.09 0.269,-0.483 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M21.388.62c-1.852 0-4.235 1.849-6.22 4.826-2.322 3.483-1.069 5.989-.062 8.002.155.31.459.517.805.549.029.001.059.003.089.003.313 0 .61-.147.8-.4 2.394-3.193 6.211-8.196 6.907-8.893C23.895 4.52 24 4.265 24 4 24 1.508 22.65.62 21.388.62zm2.378 8.995c-1.21 0-2.575 1.132-4.565 3.785-2.124 2.831-2.461 5.313-1.095 8.047.151.302.444.507.779.546.038.005.077.007.115.007.295 0 .577-.131.769-.359 1.719-2.063 5.173-6.168 5.938-6.934.188-.188.293-.442.293-.707 0-1.085 0-4.385-2.234-4.385z"/><path fill="#77B255" d="M29.874 11.517c-.268-.482-.878-.654-1.359-.385-7.171 3.983-13.783 14.15-16.367 19.609.838-10.195 5.569-20.044 13.559-28.034.391-.391.391-1.023 0-1.414s-1.023-.391-1.414 0C16.33 9.256 11.466 19.01 10.288 29.174c-.674-5.697-.978-13.91 1.625-19.768.225-.505-.003-1.096-.507-1.32-.505-.226-1.096.003-1.32.507-1.326 2.983-1.945 6.501-2.162 10.009C7.04 16.718 6.001 15 4.472 15h-.046c-.91 0-1.691.466-2.321 1.726-.247.494-.047.922.447 1.169.495.248 1.095.046 1.342-.447.311-.622.525-.77.521-.792.636.196 1.744 2.696 2.162 3.642.196.443.374.842.527 1.15.148.296.425.478.728.529.026 4.957.698 9.53 1.163 12.091l.02.11c.088.483.509.822.984.822.059 0 .119-.005.179-.016.122-.023.231-.071.331-.132.147.086.308.148.491.148s.344-.062.492-.147c.144.085.302.147.482.147H12c.53 0 .971-.448 1-.98.057-1.037 2.494-6.014 6.143-11.043.104-.015.207-.033.305-.082.244-.122.517-.272.808-.433.934-.517 2.494-1.38 3.106-1.02.149.088.638.535.638 2.558 0 .553.447 1 1 1s1-.447 1-1c0-2.236-.53-3.636-1.622-4.28-.783-.461-1.668-.424-2.54-.174 2.32-2.714 4.938-5.165 7.647-6.67.484-.269.658-.876.389-1.359z"/></svg>
\ No newline at end of file