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/1f397.svg b/public/emoji/1f397.svg
index 9c6a7b408..3f4a798bd 100644
--- a/public/emoji/1f397.svg
+++ b/public/emoji/1f397.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(13.1932,27.3765)" id="g20"><path id="path22" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.557,1.624 4.807,1.624 3.25,0 4.954,-1.692 4.954,-1.692 l 0.186,-0.137 c 0,0 1.907,3.594 0.517,6.659 C 9.4,7.16 7.468,8.124 4.807,8.124 2.252,8.124 0.356,7.23 -0.733,6.535 -2.24,3.467 -0.224,-0.126 -0.224,-0.126 L 0,0 Z"/></g><g transform="translate(11.4435,33.1466)" id="g24"><path id="path26" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.01,-0.009 -0.039,-0.035 -0.042,-0.038 l 0,0 c 0.013,0.01 0.024,0.022 0.038,0.033 C -0.003,-0.004 -0.001,-0.001 0,0"/></g><g transform="translate(28.3818,8.3232)" id="g28"><path id="path30" style="fill:#50a5e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.06,0.071 -3.026,3.58 -6.27,7.491 -7.433,5.816 -8.856,3.768 -10.279,1.72 c 3.236,-4.656 6.436,-9.257 6.488,-9.33 0.094,-0.135 0.247,-0.213 0.409,-0.213 0.018,0 0.034,0.001 0.052,0.003 0.181,0.018 0.336,0.133 0.408,0.299 l 3,7 C 0.152,-0.347 0.122,-0.145 0,0"/></g><g transform="translate(14.0396,25.9043)" id="g32"><path id="path34" style="fill:#50a5e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.343,0.509 -0.611,0.996 -0.846,1.472 -1.873,3.55 -1.971,5.321 -1.791,6.806 -1.732,7.293 -1.639,7.711 -1.58,8.007 -2.173,7.629 -2.505,7.328 -2.596,7.242 -2.597,7.242 -2.599,7.238 -2.6,7.237 -2.614,7.227 -2.625,7.215 -2.638,7.204 -4.76,5.505 -5.883,3.308 -5.883,0.846 c 0,-2.469 1.718,-4.782 3.237,-7.043 0.105,-0.156 1.194,-1.727 2.706,-3.904 1.357,1.636 2.755,3.334 4.01,4.88 C 2.187,-2.904 0.618,-0.918 0,0"/></g><g transform="translate(24.6846,33.0254)" id="g36"><path id="path38" style="fill:#2b7bb9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.086,0.083 c -0.035,0.034 -0.368,0.343 -0.941,0.722 0.058,-0.297 0.156,-0.729 0.218,-1.237 0.178,-1.473 0.084,-3.228 -0.921,-5.285 -0.24,-0.491 -0.516,-0.994 -0.87,-1.52 -0.608,-0.903 -2.135,-2.838 -3.975,-5.105 -1.255,-1.546 -2.653,-3.244 -4.01,-4.88 -3.278,-3.953 -6.296,-7.525 -6.357,-7.596 -0.122,-0.145 -0.153,-0.347 -0.079,-0.521 l 3,-7 c 0.073,-0.166 0.228,-0.281 0.409,-0.3 0.017,-0.002 0.034,-0.003 0.051,-0.003 0.163,0 0.316,0.079 0.41,0.213 0.052,0.074 3.305,4.751 6.569,9.447 1.423,2.048 2.847,4.096 4.01,5.77 1.465,2.11 2.515,3.625 2.618,3.778 1.518,2.261 3.237,4.574 3.237,7.042 C 3.283,-3.914 2.148,-1.703 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#1C6399" d="M13.193 8.624S14.75 7 18 7s4.955 1.692 4.955 1.692l.186.136s1.906-3.594.517-6.659C22.593 1.464 20.661.5 18 .5c-2.554 0-4.451.893-5.54 1.589-1.507 3.068.509 6.661.509 6.661l.224-.126zm-1.749-5.771l-.042.038.038-.033.004-.005z"/><path fill="#50A5E6" d="M28.382 27.677c-.06-.071-3.026-3.58-6.27-7.491l-4.01 5.771 6.488 9.33c.095.135.248.213.41.213.018 0 .034-.001.052-.003.181-.019.336-.134.408-.3l3-7c.074-.174.044-.376-.078-.52zM14.04 10.096c-.343-.509-.611-.996-.846-1.472-1.027-2.078-1.125-3.849-.945-5.333.059-.487.152-.905.211-1.202-.593.378-.925.679-1.016.765l-.004.005-.038.033C9.28 4.591 8.156 6.788 8.156 9.25c0 2.469 1.719 4.781 3.237 7.042.105.156 1.195 1.727 2.707 3.904 1.357-1.636 2.755-3.334 4.009-4.88-1.882-2.316-3.451-4.302-4.069-5.22z"/><path fill="#2B7BB9" d="M24.685 2.975l-.086-.083c-.035-.034-.368-.343-.941-.722.058.298.157.729.218 1.237.178 1.473.084 3.228-.921 5.285-.24.491-.516.994-.87 1.52-.608.902-2.135 2.838-3.975 5.105-1.255 1.546-2.653 3.244-4.009 4.88-3.278 3.953-6.297 7.525-6.357 7.596-.124.145-.154.347-.08.52l3 7c.072.166.228.281.408.3.018.002.034.003.052.003.162 0 .315-.078.409-.213.052-.074 3.305-4.751 6.569-9.447l4.01-5.771c1.465-2.11 2.516-3.624 2.619-3.778 1.518-2.261 3.237-4.574 3.237-7.042 0-2.477-1.135-4.687-3.283-6.39z"/></svg>
\ No newline at end of file