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/1f924.svg b/public/emoji/1f924.svg
index c81e62d6c..9af71fc9d 100644
--- a/public/emoji/1f924.svg
+++ b/public/emoji/1f924.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,18)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(22.5,11)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.5,0 c -5.6,0 -7,1 -7,1 0,0 1.267,-3.594 6.179,-3.963 C -5.217,-2.986 -5.11,-3 -5,-3 l 4.5,0 c 0.825,0 2,1.175 2,2 0,0.825 -0.675,1 -1.5,1"/></g><g transform="translate(15.8128,18.1119)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.176,-0.143 -0.427,-0.147 -0.61,-0.014 -0.013,0.01 -1.261,0.902 -3.702,0.902 -2.441,0 -3.69,-0.892 -3.701,-0.9 -0.182,-0.136 -0.434,-0.133 -0.611,0.009 -0.178,0.142 -0.238,0.386 -0.146,0.594 0.061,0.135 1.5,3.297 4.458,3.297 2.958,0 4.397,-3.162 4.457,-3.297 C 0.236,0.384 0.176,0.142 0,0"/></g><g transform="translate(28.8125,18.1119)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.176,-0.143 -0.426,-0.148 -0.61,-0.014 -0.012,0.01 -1.261,0.902 -3.702,0.902 -2.441,0 -3.691,-0.892 -3.701,-0.9 -0.182,-0.136 -0.433,-0.133 -0.611,0.009 -0.178,0.142 -0.238,0.386 -0.146,0.594 0.06,0.135 1.5,3.297 4.458,3.297 2.957,0 4.397,-3.162 4.457,-3.297 C 0.236,0.384 0.177,0.142 0,0"/></g><g transform="translate(13.1136,29.9984)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.552,-0.021 0.982,-0.486 0.961,-1.038 -0.022,-0.55 -0.484,-0.98 -1.034,-0.961 -0.156,0.004 -3.57,0.053 -6.339,-3.357 C -6.76,-5.782 -7.39,-5.85 -7.819,-5.501 -8.248,-5.153 -8.313,-4.523 -7.964,-4.094 -4.536,0.126 -0.183,0.007 0,0"/></g><g transform="translate(22.5166,28.3258)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.181,0.033 4.473,0.763 8.461,-2.933 8.867,-3.309 8.891,-3.942 8.515,-4.346 8.14,-4.753 7.508,-4.776 7.102,-4.4 3.874,-1.409 0.495,-1.944 0.352,-1.969 -0.19,-2.061 -0.708,-1.698 -0.803,-1.157 -0.899,-0.615 -0.541,-0.098 0,0"/></g><g transform="translate(23,10)" id="g44"><path id="path46" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.55,0 -1,-0.45 -1,-1 l 0,-4 c 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 l 0,-3.5 c 0,-0.825 0.675,-1.5 1.5,-1.5 0.825,0 1.5,0.675 1.5,1.5 L 1,-4 1,-1.5 1,-1 C 1,-0.45 0.55,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#FFCC4D" cx="18" cy="18" r="18"/><path fill="#664500" d="M22.5 25H18c-5.6 0-7-1-7-1s1.267 3.594 6.179 3.963c.104.023.211.037.321.037H22c.825 0 2-1.175 2-2s-.675-1-1.5-1zm-6.687-7.112c-.176.143-.427.147-.61.014-.013-.01-1.261-.902-3.703-.902-2.441 0-3.69.893-3.7.9-.183.137-.435.133-.611-.009-.178-.142-.238-.386-.146-.594.06-.135 1.5-3.297 4.457-3.297 2.958 0 4.397 3.162 4.457 3.297.092.207.032.449-.144.591zm12.999 0c-.176.143-.426.148-.61.014-.012-.01-1.261-.902-3.702-.902-2.44 0-3.69.893-3.7.9-.183.137-.434.133-.611-.009-.178-.142-.238-.386-.146-.594.059-.135 1.5-3.297 4.457-3.297 2.958 0 4.398 3.162 4.457 3.297.092.207.032.449-.145.591zM13.114 6.002c.552.021.982.486.961 1.038-.022.55-.484.979-1.034.96-.156-.004-3.57-.052-6.339 3.357-.348.427-.977.494-1.407.145-.429-.348-.494-.978-.145-1.407 3.428-4.219 7.78-4.1 7.964-4.093zm9.403 1.672c.181-.033 4.473-.763 8.461 2.933.406.375.43 1.008.053 1.413-.375.407-1.007.429-1.413.054-3.228-2.992-6.608-2.456-6.75-2.432-.542.093-1.06-.27-1.155-.812-.095-.541.263-1.057.804-1.156z"/><path fill="#88C9F9" d="M23 26h-3c-.55 0-1 .45-1 1v4c0 .55.45 1 1 1s1-.45 1-1v3.5c0 .825.675 1.5 1.5 1.5s1.5-.675 1.5-1.5V27c0-.55-.45-1-1-1z"/></svg>
\ No newline at end of file