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/1f467-1f3fb.svg b/public/emoji/1f467-1f3fb.svg
index 1836aaa67..887df9fc2 100644
--- a/public/emoji/1f467-1f3fb.svg
+++ b/public/emoji/1f467-1f3fb.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(29.96,12.9131)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.04,-3.913 4.083,-10.935 3.061,-10.935 -1.021,0 -4.115,1.852 -6.068,3.937 -1.953,2.085 -1.75,6.779 -1.75,6.779 l 1.586,4.32 C -3.171,4.101 -4.04,3.913 0,0"/></g><g transform="translate(26.96,12.9131)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.04,-3.913 4.083,-10.935 3.061,-10.935 -1.021,0 -4.115,1.852 -6.068,3.937 -1.953,2.085 -1.75,6.779 -1.75,6.779 l 1.586,4.32 C -3.171,4.101 -4.04,3.913 0,0"/></g><g transform="translate(3,2)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,0 -1,7 3,11 4,4.001 3,4.001 3,4.001 L 8,11 C 8,11 8,6 6,4 4,2 1,0 0,0"/></g><g transform="translate(6,2)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,0 -1,7 3,11 4,4.001 3,4.001 3,4.001 L 8,11 C 8,11 8,6 6,4 4,2 1,0 0,0"/></g><g transform="translate(6.9141,17.647)" id="g36"><path id="path38" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.571,2.134 -2.116,3.575 -3.45,3.217 -4.784,2.86 -5.4,0.84 -4.829,-1.294 -4.258,-3.428 -2.713,-4.868 -1.379,-4.51 -0.045,-4.153 0.572,-2.133 0,0"/></g><g transform="translate(33.915,16.3525)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.571,2.134 -0.046,4.154 -1.38,4.512 -2.713,4.868 -4.258,3.429 -4.829,1.294 -5.401,-0.84 -4.784,-2.859 -3.45,-3.217 -2.116,-3.574 -0.571,-2.134 0,0"/></g><g transform="translate(31,17)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,9.389 -5.82,16 -13,16 -7.18,0 -13,-6.611 -13,-16 0,-9.389 5.82,-15 13,-15 7.18,0 13,5.611 13,15"/></g><g transform="translate(18,8.3486)" id="g48"><path id="path50" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.42,0 -4.274,0.687 -4.352,0.715 -4.869,0.909 -5.13,1.486 -4.936,2.003 -4.742,2.52 -4.167,2.782 -3.65,2.588 -3.634,2.582 -2.04,2 0,2 2.041,2 3.635,2.582 3.65,2.588 4.166,2.782 4.744,2.517 4.936,2.001 5.129,1.484 4.868,0.909 4.352,0.715 4.274,0.687 2.421,0 0,0"/></g><g transform="translate(19,13)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(12,16)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.552,4 0,4 0.552,4 1,3.552 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(24,16)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.553,4 0,4 0.553,4 1,3.552 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(32,26.0005)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,7 -7,9 -10,9 -2,0 -4,-2 -4,-2 0,0 -2.001,2 -4,2 -3,0 -8,-2 -10,-9 -1.648,-5.769 1,-11 1,-11 0,3.001 2,9 7,9 5,0 6,4 6,4 0,0 0.786,-4 5.786,-4 5,0 7.214,-5.999 7.214,-9 0,0 2.648,5.231 1,11"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M29.96 23.087C34 27 34.043 34.021 33.021 34.021s-4.115-1.852-6.068-3.937C25 28 25.203 23.306 25.203 23.306l1.586-4.319c0-.001-.869.187 3.171 4.1z"/><path fill="#292F33" d="M26.96 23.087C31 27 31.043 34.021 30.021 34.021s-4.115-1.852-6.068-3.937C22 28 22.203 23.306 22.203 23.306l1.586-4.319c0-.001-.869.187 3.171 4.1zM3 34c-1 0-1-7 3-11s3-4 3-4l2 4s0 5-2 7-5 4-6 4z"/><path fill="#292F33" d="M6 34c-1 0-1-7 3-11s3-4 3-4l2 4s0 5-2 7-5 4-6 4z"/><path fill="#F7DECE" d="M6.914 18.353c-.571-2.134-2.116-3.575-3.45-3.217-1.334.358-1.95 2.378-1.379 4.511.571 2.135 2.116 3.574 3.45 3.217 1.334-.358 1.951-2.378 1.379-4.511zm27.001 1.294c.571-2.134-.046-4.154-1.38-4.512-1.333-.356-2.878 1.083-3.449 3.218-.572 2.134.045 4.153 1.379 4.511 1.334.358 2.879-1.083 3.45-3.217z"/><path fill="#F7DECE" d="M31 19c0-9.389-5.82-16-13-16S5 9.611 5 19s5.82 15 13 15 13-5.611 13-15z"/><path fill="#DF1F32" d="M18 27.651c-2.42 0-4.274-.687-4.352-.715-.517-.194-.779-.771-.584-1.288.194-.517.769-.779 1.286-.585.016.006 1.61.588 3.65.588 2.041 0 3.635-.582 3.65-.588.516-.194 1.094.071 1.285.587.193.517-.067 1.092-.584 1.286-.077.029-1.93.715-4.351.715z"/><path fill="#C1694F" d="M19 23h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#662113" d="M12 20c-.552 0-1-.447-1-1v-2c0-.552.448-1 1-1s1 .448 1 1v2c0 .553-.448 1-1 1zm12 0c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2c0 .553-.447 1-1 1z"/><path fill="#292F33" d="M32 10c-2-7-7-9-10-9-2 0-4 2-4 2s-2-2-4-2c-3 0-8 2-10 9-1.648 5.769 1 11 1 11 0-3.001 2-9 7-9s6-4 6-4 .786 4 5.786 4S31 18 31 21c0 0 2.648-5.231 1-11z"/></svg>
\ No newline at end of file