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/1f4ab.svg b/public/emoji/1f4ab.svg
index 9df115d2c..af3261c2d 100644
--- a/public/emoji/1f4ab.svg
+++ b/public/emoji/1f4ab.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(28.8652,28.8662)" id="g20"><path id="path22" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 7.361,-7.359 9.35,-17.304 4.443,-22.209 -4.907,-4.907 -14.85,-2.918 -22.21,4.441 -0.25,0.25 -0.478,0.51 -0.715,0.766 l 4.417,4.417 c 5.724,-5.724 13.016,-7.714 16.286,-4.442 3.271,3.27 1.282,10.563 -4.442,16.287 l 0.023,-0.021 c -0.008,0.007 -0.015,0.015 -0.021,0.022 -6.542,6.542 -15.492,8.199 -19.989,3.701 -2.175,-2.174 -2.897,-5.392 -2.338,-8.872 -0.858,4.082 -0.15,7.866 2.338,10.352 C -17.302,9.349 -7.359,7.36 0,0"/></g><g transform="translate(19.4034,2.0001)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.252,0 -0.503,0.077 -0.719,0.231 l -5.076,3.641 -5.076,-3.641 c -0.433,-0.309 -1.013,-0.309 -1.443,0.005 -0.43,0.312 -0.611,0.865 -0.45,1.369 l 1.893,6.111 -5.03,3.545 c -0.428,0.315 -0.606,0.869 -0.442,1.375 0.164,0.504 0.634,0.846 1.164,0.85 l 6.147,0.012 2.067,5.957 c 0.168,0.504 0.639,0.844 1.17,0.844 0.531,0 1.003,-0.34 1.17,-0.844 l 1.866,-5.957 6.347,-0.012 C 4.12,13.482 4.59,13.14 4.753,12.636 4.917,12.13 4.739,11.576 4.312,11.261 L -0.72,7.716 1.174,1.605 C 1.336,1.101 1.153,0.548 0.725,0.236 0.508,0.078 0.254,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FDD888" d="M28.865 7.134c7.361 7.359 9.35 17.304 4.443 22.209-4.907 4.907-14.85 2.918-22.21-4.441-.25-.25-.478-.51-.716-.766l4.417-4.417c5.724 5.724 13.016 7.714 16.286 4.442 3.271-3.271 1.282-10.563-4.441-16.287l.022.021-.021-.022C20.104 1.331 11.154-.326 6.657 4.171 4.482 6.346 3.76 9.564 4.319 13.044c-.858-4.083-.15-7.866 2.338-10.353 4.906-4.906 14.849-2.917 22.208 4.443z"/><path fill="#FFAC33" d="M19.403 34c-.252 0-.503-.077-.719-.231l-5.076-3.641-5.076 3.641c-.433.31-1.013.31-1.443-.005-.43-.312-.611-.864-.45-1.369l1.894-6.11-5.031-3.545c-.428-.315-.605-.869-.442-1.375.165-.504.634-.847 1.165-.851l6.147-.012 2.067-5.957c.168-.504.639-.844 1.17-.844.531 0 1.002.34 1.17.844l1.866 5.957 6.347.012c.532.004 1.002.347 1.165.851.164.506-.014 1.06-.442 1.375l-5.031 3.545 1.893 6.11c.162.505-.021 1.058-.449 1.369-.217.158-.471.236-.725.236z"/></svg>
\ No newline at end of file