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/1f487-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f487-1f3ff-200d-2640-fe0f.svg
index 8edd33e3f..b8b4754c0 100644
--- a/public/emoji/1f487-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f487-1f3ff-200d-2640-fe0f.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,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath64" clipPathUnits="userSpaceOnUse"><path id="path66" 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(30.1689,27.8496)" id="g20"><path id="path22" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14.849,-14.85 c 0,0 -0.707,2.121 0.707,3.536 1.415,1.415 12.728,12.728 12.728,12.728 L 0,0 Z"/></g><g transform="translate(30.1689,27.8496)" id="g24"><path id="path26" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.172,1.172 2.439,1.805 2.829,1.414 3.221,1.023 2.586,-0.242 1.414,-1.414 0.243,-2.586 -1.022,-3.219 -1.414,-2.828 -1.805,-2.438 -1.171,-1.172 0,0 M -1.414,1.414 C -3.366,-0.539 -4,-3.07 -2.828,-4.242 -1.656,-5.414 0.877,-4.781 2.829,-2.828 4.781,-0.876 5.415,1.656 4.243,2.828 3.071,4 0.539,3.367 -1.414,1.414"/></g><g transform="translate(20,25)" id="g28"><path id="path30" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,6.075 -4.925,11 -11,11 -1.721,0 -3.343,-0.406 -4.793,-1.111 C -16.186,9.958 -16.588,10 -17,10 c -3.866,0 -7,-3.134 -7,-7 l 0,-12 0.018,0 c 0.183,-6.467 5.471,-11.656 11.982,-11.656 3.358,0 6.384,1.387 8.559,3.612 C 2.426,-17.507 9,-25 9,-25 l 7,9 C 1,-10 0,0 0,0"/></g><g transform="translate(17,9)" id="g32"><path id="path34" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path36" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,0 -1,0 0,4 1,0 0,-4 z"/><path id="path38" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 -1,4 0,4 0,0 Z"/><g transform="translate(10.9995,8.0049)" id="g40"><path id="path42" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3.995 -6,0 0,-4 0.001,0 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 C 0.001,-0.003 0,-0.002 0,0"/></g><g transform="translate(4,31)" id="g44"><path id="path46" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,-5.308 -5,-5.936 L -5,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><g transform="translate(12,15)" id="g48"><path id="path50" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 -4,0 c 0,0 1,-2 4,-2 3,0 4,2 4,2"/></g><g transform="translate(24,30)" id="g52"><path id="path54" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-21 c 0,0 2,1 2,3 L 2,0 0,0 Z"/></g><g transform="translate(23,27)" id="g56"><path id="path58" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.553,0 -1,1.343 -1,3 -1,4.657 -0.553,6 0,6 0.553,6 1,4.657 1,3 1,1.343 0.553,0 0,0 M 0,8 C -1.657,8 -3,5.761 -3,3 -3,0.239 -1.657,-2 0,-2 1.657,-2 3,0.239 3,3 3,5.761 1.657,8 0,8"/></g></g></g><g id="g60"><g clip-path="url(#clipPath64)" id="g62"><g transform="translate(26,24)" id="g68"><path id="path70" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(9,16.5)" id="g72"><path id="path74" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(4,20)" id="g76"><path id="path78" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(12,20)" id="g80"><path id="path82" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M30.169 8.15L15.32 23s-.707-2.121.707-3.535L28.755 6.736l1.414 1.414z"/><path fill="#67757F" d="M28.755 6.736c-1.952 1.953-2.586 4.484-1.414 5.656s3.705.539 5.657-1.414c1.952-1.952 2.586-4.484 1.414-5.656-1.172-1.172-3.704-.539-5.657 1.414zm1.414 1.414c1.172-1.172 2.438-1.805 2.829-1.414.392.391-.243 1.656-1.415 2.828-1.171 1.172-2.437 1.805-2.828 1.414-.391-.39.243-1.656 1.414-2.828z"/><path fill="#0B0200" d="M20 11C20 4.925 15.075 0 9 0 7.279 0 5.657.406 4.207 1.111 3.814 1.042 3.412 1 3 1c-1.075 0-2.09.25-3 .683v26.894c2.122 1.909 4.92 3.08 8 3.08 3.358 0 6.384-1.388 8.559-3.612C22.426 28.507 29 36 29 36l7-9c-15-6-16-16-16-16z"/><path fill="#9268CA" d="M20.61 29.303C19.97 27.946 18.6 27 17 27H0v9h21v-5c0-.609-.147-1.18-.39-1.697z"/><path fill="#7450A8" d="M16 32h1v4h-1z"/><path fill="#7C533E" d="M4 5s-.01 4.562-4 5.724v10.394c1.044 2.019 2.831 3.591 5 4.359V28c0 1.657 1.343 3 3 3s3-1.343 3-3v-2.523c3.494-1.237 6-4.56 6-8.477v-5.019C5.89 11.605 4 5 4 5z"/><path fill="#DF1F32" d="M12 21H4s1 2 4 2 4-2 4-2z"/><path fill="#3D2E24" d="M9 19.5H7c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path d="M4 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/><path fill="#9AAAB4" d="M24 6v21s2-1 2-3V6h-2z"/><circle fill="#67757F" cx="25" cy="12" r="1"/><path fill="#67757F" d="M23 1c-1.657 0-3 2.239-3 5s1.343 5 3 5 3-2.239 3-5-1.343-5-3-5zm0 8c-.553 0-1-1.343-1-3s.447-3 1-3 1 1.343 1 3-.447 3-1 3z"/></svg>
\ No newline at end of file