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/1f44b-1f3fb.svg b/public/emoji/1f44b-1f3fb.svg
index 86471187b..8578b7f79 100644
--- a/public/emoji/1f44b-1f3fb.svg
+++ b/public/emoji/1f44b-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(4.8613,26.853)" id="g20"><path id="path22" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.941,0.657 2.357,0.531 3.201,-0.166 L 2.232,1.241 C 1.453,2.352 1.732,3.554 2.845,4.333 3.957,5.111 5.491,4.842 6.271,3.729 L 15.1,-8.853 15.17,-8.822 7.107,3.022 c -0.786,1.122 -0.638,2.544 0.484,3.331 1.122,0.784 2.67,0.513 3.456,-0.611 l 10.42,-14.72 c 0.786,-1.123 0.401,-2.661 -0.721,-3.447 -0.191,-0.134 -0.397,-0.226 -0.607,-0.299 l 0,-9.129 -10,0 0,3.113 c -0.147,0.129 -0.967,0.763 -1.083,0.929 L -0.611,-3.478 C -1.404,-2.349 -1.13,-0.792 0,0"/></g><g transform="translate(2.6953,18.6636)" id="g24"><path id="path26" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1.132,1.65 0.519,2.781 2.168,3.912 3.299,2.262 3.299,2.262 L 8.55,-5.396 c 0.18,0.302 0.379,0.6 0.599,0.893 L 1.861,6.127 c 0,0 -1.131,1.649 0.519,2.78 1.649,1.132 2.78,-0.518 2.78,-0.518 l 6.856,-9.997 c 0.255,0.209 0.515,0.417 0.785,0.622 l -7.947,11.59 c 0,0 -1.131,1.649 0.518,2.78 1.649,1.132 2.78,-0.518 2.78,-0.518 L 16.1,1.277 c 0.292,0.179 0.581,0.335 0.87,0.498 L 9.543,12.607 c 0,0 -1.131,1.649 0.519,2.78 1.649,1.132 2.78,-0.518 2.78,-0.518 L 20.696,3.415 21.325,2.498 21.89,1.673 c -4.948,-3.393 -5.419,-9.779 -2.592,-13.902 0.566,-0.825 1.391,-0.26 1.391,-0.26 -3.394,4.949 -2.357,10.51 2.592,13.903 l -1.462,7.302 c 0,0 -0.545,1.925 1.379,2.47 1.924,0.545 2.469,-1.379 2.469,-1.379 l 1.685,-5.004 c 0.668,-1.984 1.379,-3.961 2.32,-5.83 2.657,-5.28 1.07,-11.843 -3.941,-15.279 -5.465,-3.747 -12.935,-2.355 -16.683,3.11 -0.198,0.29 -0.364,0.573 -0.522,0.856 L 8.482,-12.371 0,0 Z"/></g><g transform="translate(12,3.958)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4,0 -8.042,4.042 -8.042,8.042 0,0.553 -0.405,1 -0.958,1 -0.553,0 -1.042,-0.447 -1.042,-1 C -10.042,2.042 -6,-2 0,-2 0.553,-2 1,-1.511 1,-0.958 1,-0.405 0.553,0 0,0"/></g><g transform="translate(7,2)" id="g32"><path id="path34" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,0 -5,2 -5,5 0,0.553 -0.447,1 -1,1 -0.553,0 -1,-0.447 -1,-1 0,-4 3,-7 7,-7 0.553,0 1,0.447 1,1 0,0.553 -0.447,1 -1,1"/></g><g transform="translate(24,34)" id="g36"><path id="path38" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 4,0 8,-3.589 8,-8 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 C 10,-4.486 6,0 0,0"/></g><g transform="translate(29,35.9585)" id="g40"><path id="path42" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.552,0 -1,-0.406 -1,-0.958 -1,-1.511 -0.552,-2 0,-2 c 3,0 4.958,-2.225 4.958,-4.958 0,-0.553 0.49,-1 1.042,-1 0.552,0 0.958,0.447 0.958,1 C 6.958,-3.122 4,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E0AA94" d="M4.861 9.147c.94-.657 2.357-.531 3.201.166l-.968-1.407c-.779-1.111-.5-2.313.612-3.093 1.112-.777 2.646-.509 3.426.605L19.961 18l.07-.031-8.062-11.844c-.786-1.122-.639-2.544.483-3.331 1.122-.784 2.67-.513 3.456.611l10.42 14.72c.787 1.123.401 2.661-.721 3.447-.191.134-.397.226-.607.299V31H15v-3.113c-.146-.129-.967-.763-1.083-.929L4.25 12.625c-.793-1.129-.519-2.686.611-3.478z"/><path fill="#F7DECE" d="M2.695 17.336s-1.132-1.65.519-2.781c1.649-1.131 2.78.518 2.78.518l5.251 7.658c.181-.302.379-.6.6-.894L4.557 11.21s-1.131-1.649.519-2.78c1.649-1.131 2.78.518 2.78.518l6.855 9.997c.255-.208.516-.417.785-.622L7.549 6.732s-1.131-1.649.519-2.78c1.649-1.131 2.78.518 2.78.518l7.947 11.589c.292-.179.581-.334.871-.498L12.238 4.729s-1.131-1.649.518-2.78c1.649-1.131 2.78.518 2.78.518l7.854 11.454.629.917.565.825c-4.948 3.394-5.419 9.779-2.592 13.902.565.825 1.39.26 1.39.26-3.393-4.949-2.357-10.51 2.592-13.903L24.515 8.62s-.545-1.924 1.378-2.47c1.924-.545 2.47 1.379 2.47 1.379l1.685 5.004c.668 1.984 1.379 3.961 2.32 5.831 2.657 5.28 1.07 11.842-3.94 15.279-5.465 3.747-12.936 2.354-16.684-3.11-.198-.29-.364-.573-.522-.855l-.044.03-8.483-12.372z"/><g fill="#5DADEC"><path d="M12 32.042C8 32.042 3.958 28 3.958 24c0-.553-.405-1-.958-1s-1.042.447-1.042 1C1.958 30 6 34.042 12 34.042c.553 0 1-.489 1-1.042s-.447-.958-1-.958z"/><path d="M7 34c-3 0-5-2-5-5 0-.553-.447-1-1-1s-1 .447-1 1c0 4 3 7 7 7 .553 0 1-.447 1-1s-.447-1-1-1zM24 2c-.552 0-1 .448-1 1s.448 1 1 1c4 0 8 3.589 8 8 0 .552.448 1 1 1s1-.448 1-1c0-5.514-4-10-10-10z"/><path d="M29 .042c-.552 0-1 .406-1 .958s.448 1.042 1 1.042c3 0 4.958 2.225 4.958 4.958 0 .552.489 1 1.042 1s.958-.448.958-1C35.958 3.163 33 .042 29 .042z"/></g></svg>
\ No newline at end of file