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/1f5e1.svg b/public/emoji/1f5e1.svg
index 9f4d1b5da..74bbf3c43 100644
--- a/public/emoji/1f5e1.svg
+++ b/public/emoji/1f5e1.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><clipPath id="clipPath36" clipPathUnits="userSpaceOnUse"><path id="path38" d="M 11.208,16.2 3.43,8.422 C 2.649,7.641 2.776,6.248 3.712,5.311 l 0,0 0.849,-0.848 C 5.498,3.525 6.891,3.398 7.673,4.18 l 0,0 7.777,7.777 c 0.782,0.782 0.655,2.174 -0.282,3.113 l 0,0 -0.848,0.848 c -0.524,0.524 -1.191,0.794 -1.814,0.794 l 0,0 C 12.015,16.713 11.552,16.544 11.208,16.2"/></clipPath><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" 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(12.6221,19.0288)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.708,0.707 7.072,12.729 22.628,16.971 21.214,15.557 2.122,-3.536 1.415,-4.243 0.708,-3.536 0,0 0,0"/></g><g transform="translate(18.2793,13.3711)" id="g24"><path id="path26" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.707,0.707 12.729,7.073 16.971,22.629 15.557,21.214 -3.536,2.122 -4.243,1.415 -3.536,0.707 0,0 0,0"/></g><g transform="translate(15.4507,11.957)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.781,0.781 0.655,2.174 -0.283,3.112 l -0.848,0.849 c -0.938,0.937 -2.33,1.063 -3.112,0.282 l -7.778,-7.778 c -0.781,-0.781 -0.654,-2.174 0.283,-3.111 l 0.848,-0.848 c 0.938,-0.938 2.331,-1.065 3.112,-0.283 L 0,0 Z"/></g></g></g><g id="g32"><g clip-path="url(#clipPath36)" id="g34"><g transform="translate(19.0107,10.7402)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.108,-0.543 -0.984,-0.824 -1.96,-0.629 l -14.121,2.824 c -0.975,0.196 -1.677,0.791 -1.569,1.334 0.109,0.543 0.987,0.823 1.961,0.627 L -1.567,1.332 C -0.592,1.137 0.108,0.541 0,0"/></g><g transform="translate(22.2852,14.0137)" id="g44"><path id="path46" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.108,-0.543 -0.985,-0.824 -1.961,-0.627 l -14.121,2.823 c -0.974,0.196 -1.677,0.792 -1.568,1.333 0.108,0.543 0.986,0.823 1.961,0.628 L -1.568,1.334 C -0.593,1.138 0.108,0.542 0,0"/></g><g transform="translate(18.2266,6.8184)" id="g48"><path id="path50" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.108,-0.543 -0.984,-0.824 -1.96,-0.629 l -14.122,2.824 c -0.974,0.196 -1.676,0.791 -1.568,1.334 0.108,0.541 0.986,0.823 1.961,0.627 L -1.568,1.332 C -0.593,1.137 0.108,0.541 0,0"/></g><g transform="translate(14.6616,3.252)" id="g52"><path id="path54" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.108,-0.541 -0.985,-0.822 -1.96,-0.627 l -14.122,2.824 c -0.974,0.196 -1.677,0.791 -1.568,1.334 0.108,0.541 0.986,0.823 1.961,0.627 L -1.568,1.334 C -0.593,1.139 0.108,0.543 0,0"/></g></g></g><g id="g56"><g clip-path="url(#clipPath60)" id="g58"><g transform="translate(6.9653,2.0586)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.562,-1.562 -4.095,-1.562 -5.657,0 -1.562,1.562 -1.562,4.094 0,5.656 1.562,1.563 4.114,1.598 5.676,0.035 C 1.581,4.129 1.562,1.562 0,0"/></g><g transform="translate(19.6934,9.8359)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.586,-0.586 -1.536,-0.586 -2.121,0 l -8.839,8.839 c -0.586,0.586 -0.586,1.536 0,2.121 0.586,0.586 1.535,0.586 2.121,0 L 0,2.121 C 0.586,1.537 0.586,0.586 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M12.622 16.971C13.33 16.264 19.694 4.243 35.25 0c-1.414 1.415-19.54 21.691-19.54 21.691l-3.088-4.72z"/><path fill="#9AAAB4" d="M18.279 22.629C18.986 21.922 31.008 15.556 35.25 0L14.037 21.214l4.242 1.415z"/><path fill="#292F33" d="M15.451 24.043c.781-.781.655-2.174-.283-3.112l-.848-.849c-.938-.938-2.331-1.063-3.112-.282L3.43 27.578c-.781.781-.654 2.174.283 3.111l.848.848c.938.938 2.331 1.064 3.111.283l7.779-7.777z"/><path d="M7.108 23.9l7.071 1.414 1.271-1.271c.133-.133.23-.288.311-.452L8.807 22.2l-1.699 1.7zm7.212-3.818c-.938-.938-2.331-1.063-3.112-.282l-.826.826 5.328 1.065c-.131-.27-.312-.529-.543-.76l-.847-.849zM5.408 25.6l-1.699 1.699 7.071 1.414 1.699-1.699zm-2.422 3.793c.107.46.346.916.727 1.297l.848.848c.103.103.213.192.325.275l2.11.422c.252-.084.483-.22.676-.414l1.242-1.242-5.928-1.186z" fill="#67757F"/><circle fill="#292F33" cx="4.142" cy="31.104" r="4"/><path fill="#292F33" d="M19.693 26.164c-.586.586-1.536.586-2.121 0l-8.839-8.839c-.586-.586-.586-1.536 0-2.121.586-.586 1.535-.586 2.121 0l8.839 8.839c.586.584.586 1.535 0 2.121z"/></svg>
\ No newline at end of file