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/1f431.svg b/public/emoji/1f431.svg
index 7576d6bf3..117343239 100644
--- a/public/emoji/1f431.svg
+++ b/public/emoji/1f431.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(33,19)" id="g20"><path id="path22" style="fill:#ffcb4e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.072,6.084 1.262,15.048 0,15.864 -1.262,16.679 -10.072,13.648 -11.914,9.601 -12.919,9.868 -15.001,10 -15.001,10 c 0,0 -2.013,-0.132 -3.017,-0.399 -1.842,4.047 -10.721,7.078 -11.982,6.263 -1.262,-0.816 -1.074,-9.78 0,-15.864 0,0 -0.967,-1.979 -0.967,-8.95 l 16,3.967 0,0.837 16,-4.837 C 1.033,-1.979 0,0 0,0"/></g><g transform="translate(23.9463,16.7178)" id="g24"><path id="path26" style="fill:#ffd882;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.085,0 -4.273,-0.477 -5.913,-1.281 -7.552,-0.477 -9.74,0 -11.825,0 c -9.932,0 -10.088,-5.1 -10.088,-6.664 0,-1.559 1.967,-10.033 15.967,-10.033 14,0 16.033,8.441 16.033,10 C 10.087,-5.133 9.931,0 0,0"/></g><g transform="translate(23.4063,27.9463)" id="g28"><path id="path30" style="fill:#f28f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.17,2.383 6.681,4.172 7.607,3.945 8.359,3.764 8.242,-2.441 7.639,-5.992 5.076,-1.742 0,0 0,0"/></g><g transform="translate(12.6602,27.9463)" id="g32"><path id="path34" style="fill:#f28f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.168,2.383 -6.68,4.172 -7.606,3.945 -8.359,3.764 -8.242,-2.441 -7.637,-5.992 -5.074,-1.742 0,0 0,0"/></g><g transform="translate(22.04,16)" id="g36"><path id="path38" style="fill:#faaa35;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.693 -1.809,13 -4.04,13 -2.231,0 -4.04,-8.307 -4.04,-13 0,-4.695 1.809,-2 4.04,-2 C -1.809,-2 0,-4.695 0,0"/></g><g transform="translate(15.0195,19.001)" id="g40"><path id="path42" style="fill:#2a2f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.904,-2 -2.02,-2 -1.115,0 -2.019,0.895 -2.019,2 0,1.104 0.904,1.998 2.019,1.998 C -0.904,1.998 0,1.104 0,0"/></g><g transform="translate(25.0391,19)" id="g44"><path id="path46" style="fill:#2a2f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.904,-2 -2.02,-2 -1.115,0 -2.019,0.895 -2.019,2 0,1.104 0.904,1.998 2.019,1.998 C -0.904,1.998 0,1.104 0,0"/></g><g transform="translate(18.0195,7.125)" id="g48"><path id="path50" style="fill:#f28f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2.875 c 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(22.0703,4.918)" id="g52"><path id="path54" style="fill:#f28f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.002,0 -4.957,2.761 -5.001,2.896 -0.172,0.525 0.114,1.09 0.64,1.261 0.523,0.172 1.078,-0.109 1.256,-0.624 C -3.061,3.417 -2.229,1.396 1.733,2.188 2.28,2.3 2.803,1.944 2.91,1.403 3.019,0.861 2.667,0.335 2.126,0.227 1.337,0.068 0.631,0 0,0"/></g><g transform="translate(13.9307,4.918)" id="g56"><path id="path58" style="fill:#f28f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.632,0 -1.337,0.068 -2.127,0.227 -2.668,0.335 -3.02,0.861 -2.911,1.403 -2.804,1.944 -2.282,2.301 -1.734,2.188 2.268,1.39 3.114,3.458 3.148,3.547 3.344,4.055 3.915,4.324 4.426,4.138 4.937,3.952 5.211,3.4 5.036,2.886 4.99,2.75 4.002,0 0,0"/></g><g transform="translate(22.0195,14.4082)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.758 -3.216,-3.979 -4.02,-3.979 -0.802,0 -4.019,2.221 -4.019,3.979 0,1.76 2.244,1.592 4.019,1.592 C -2.244,1.592 0,1.76 0,0"/></g><g transform="translate(34.0215,4.0654)" id="g64"><path id="path66" style="fill:#f39120;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.277,0 -0.553,0.115 -0.751,0.339 -0.03,0.035 -3.181,3.502 -10.41,4.624 -0.546,0.085 -0.92,0.596 -0.835,1.141 0.085,0.546 0.597,0.916 1.142,0.835 0.366,-0.056 0.723,-0.119 1.072,-0.186 C -2.54,5.349 0.617,1.813 0.754,1.657 1.116,1.241 1.073,0.609 0.657,0.246 0.468,0.081 0.233,0 0,0"/></g><g transform="translate(23.0137,9.0166)" id="g68"><path id="path70" style="fill:#f39120;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.406,0 -0.789,0.25 -0.939,0.653 -1.13,1.172 -0.864,1.747 -0.347,1.938 5.13,3.962 11.814,2.127 12.104,2.047 12.636,1.898 12.946,1.348 12.799,0.816 12.652,0.284 12.102,-0.026 11.569,0.119 11.505,0.137 5.211,1.858 0.347,0.061 0.232,0.02 0.115,0 0,0"/></g><g transform="translate(1.9883,4.0654)" id="g72"><path id="path74" style="fill:#f39120;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.277,0 0.553,0.115 0.751,0.339 0.03,0.035 3.181,3.502 10.41,4.624 0.546,0.085 0.92,0.596 0.835,1.141 C 11.911,6.65 11.399,7.02 10.855,6.939 10.488,6.883 10.131,6.82 9.782,6.753 2.54,5.349 -0.617,1.813 -0.754,1.657 -1.116,1.241 -1.073,0.609 -0.657,0.246 -0.468,0.081 -0.233,0 0,0"/></g><g transform="translate(12.9961,9.0166)" id="g76"><path id="path78" style="fill:#f39120;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.406,0 0.789,0.25 0.939,0.653 1.13,1.172 0.864,1.747 0.347,1.938 -5.13,3.962 -11.814,2.127 -12.104,2.047 c -0.532,-0.149 -0.842,-0.699 -0.695,-1.231 0.147,-0.532 0.697,-0.842 1.23,-0.697 0.064,0.018 6.358,1.739 11.222,-0.058 C -0.232,0.02 -0.115,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCB4E" d="M33 17c1.072-6.084 1.262-15.048 0-15.864C31.738.322 22.928 3.353 21.086 7.4 20.081 7.132 18 7 18 7s-2.013.132-3.017.399C13.14 3.352 4.261.321 3 1.136 1.738 1.952 1.926 10.916 3 17c0 0-.967 1.979-.967 8.95l16-3.967 16 4C34.033 18.979 33 17 33 17z"/><path fill="#FFD882" d="M23.946 19.282c-2.085 0-4.273.477-5.913 1.281-1.639-.805-3.827-1.281-5.912-1.281-9.932 0-10.088 5.1-10.088 6.664C2.033 27.505 4 35.979 18 35.979s16.033-8.441 16.033-10c0-1.564-.156-6.697-10.087-6.697z"/><path fill="#F28F20" d="M23.406 8.054c2.17-2.383 6.681-4.172 7.607-3.945.752.182.635 6.387.031 9.938-2.562-4.251-7.638-5.993-7.638-5.993zm-10.746 0c-2.168-2.383-6.68-4.172-7.606-3.945-.754.182-.637 6.387-.031 9.938 2.563-4.251 7.637-5.993 7.637-5.993z"/><path fill="#FAAA35" d="M22.04 20c0-4.693-1.809-13-4.04-13s-4.04 8.307-4.04 13c0 4.695 1.809 2 4.04 2s4.04 2.695 4.04-2z"/><path fill="#2A2F33" d="M15.019 16.999c0 1.105-.904 2-2.019 2s-2.019-.895-2.019-2c0-1.104.904-1.998 2.019-1.998s2.019.895 2.019 1.998zm10.02.001c0 1.105-.904 2-2.02 2C21.904 19 21 18.105 21 17c0-1.104.904-1.998 2.02-1.998 1.115 0 2.019.894 2.019 1.998z"/><path fill="#F28F20" d="M23.804 28.895c-3.488.696-4.55-.785-4.784-1.229V25c0-.553-.447-1-1-1-.553 0-1 .447-1 1v2.659c-.246.452-1.338 1.931-4.823 1.236-.548-.113-1.069.243-1.177.784-.108.542.243 1.068.784 1.177.79.158 1.495.227 2.127.227 2.078 0 3.339-.741 4.081-1.473.735.733 1.986 1.473 4.058 1.473.631 0 1.337-.068 2.126-.227.541-.108.893-.635.784-1.177-.107-.541-.629-.897-1.176-.784z"/><path fill="#292F33" d="M22.02 21.592c0 1.758-3.216 3.978-4.02 3.978-.803 0-4.019-2.221-4.019-3.978C13.981 19.832 16.225 20 18 20s4.02-.168 4.02 1.592z"/><path fill="#F39120" d="M34.021 31.935c-.277 0-.553-.115-.751-.339-.03-.035-3.181-3.502-10.41-4.624-.546-.085-.92-.596-.835-1.142.085-.546.597-.915 1.142-.835.366.057.724.119 1.072.187 7.242 1.404 10.399 4.939 10.536 5.096.362.416.319 1.048-.097 1.411-.189.165-.423.246-.657.246z"/><path fill="#F39120" d="M23.014 26.983c-.406 0-.789-.25-.939-.653-.191-.519.074-1.094.592-1.285 5.477-2.023 12.161-.189 12.45-.108.532.148.843.699.695 1.23-.146.532-.697.843-1.229.697-.064-.018-6.358-1.739-11.223.058-.114.042-.231.061-.346.061zM1.988 31.935c.277 0 .553-.115.751-.339.03-.035 3.181-3.502 10.41-4.624.546-.085.92-.596.835-1.142-.085-.546-.597-.915-1.142-.835-.366.057-.724.119-1.072.187-7.242 1.404-10.399 4.939-10.536 5.096-.362.416-.319 1.048.097 1.411.19.165.424.246.657.246z"/><path fill="#F39120" d="M12.996 26.983c.406 0 .789-.25.938-.653.191-.519-.074-1.094-.592-1.285-5.477-2.023-12.161-.189-12.45-.108-.532.148-.843.699-.695 1.23.146.532.697.843 1.229.697.064-.018 6.358-1.739 11.223.058.115.042.232.061.347.061z"/></svg>
\ No newline at end of file