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/1f1f8-1f1fd.svg b/public/emoji/1f1f8-1f1fd.svg
index 00d7eb4d5..20472431e 100644
--- a/public/emoji/1f1f8-1f1fd.svg
+++ b/public/emoji/1f1f8-1f1fd.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(36,9)" id="g20"><path id="path22" style="fill:#032a87;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#dc181e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-9 36,0 0,9 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(1.313,6.0547)" id="g28"><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 15.718,11.881 0.017,23.904 c -0.811,-0.732 -1.33,-1.78 -1.33,-2.959 l 0,-18 C -1.313,1.774 -0.801,0.731 0,0"/></g><g transform="translate(8.625,21.2607)" id="g32"><path id="path34" style="fill:#fada10;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.915 -0.962,-1.657 -2.148,-1.657 -1.187,0 -2.149,0.742 -2.149,1.657 0,0.915 0.962,1.656 2.149,1.656 C -0.962,1.656 0,0.915 0,0"/></g><g transform="translate(3.8545,21.9585)" id="g36"><path id="path38" style="fill:#bd725f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.46,0.46 2.119,0.437 2.622,0.146 2.062,0.9 2.833,0.542 3.438,0.542 4.042,0.543 4.208,0.356 3.813,0.314 3.417,0.271 3.083,0.334 3.188,0.209 3.292,0.084 3.896,0.189 4.437,0.314 4.979,0.437 5.604,-0.02 5.646,-0.104 5.687,-0.187 4.687,0.021 4.333,-0.104 3.979,-0.229 3.416,-0.208 3.458,-0.333 3.5,-0.458 2.869,-0.541 2.622,-0.479 2.375,-0.416 1.354,-0.437 1.521,-0.333 1.687,-0.229 1.896,-0.104 1.979,-0.062 2.063,-0.02 0.729,0.021 0,0"/></g><g transform="translate(10.1563,21.4375)" id="g40"><path id="path42" style="fill:#dc181e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.939,-0.477 -1.891,-0.25 -2.938,0 -3.703,-0.111 -3.703,-0.391 -3.703,-0.111 -4.469,0 -5.516,-0.25 -6.467,-0.477 -7.406,0 -7.406,0 c 0,0 0.694,-1.109 0.281,-3.328 -0.422,-2.266 -0.297,-3.297 1.49,-3.364 1.51,-0.057 1.932,-0.511 1.932,-0.511 0,0 0.421,0.454 1.932,0.511 1.787,0.067 1.912,1.098 1.49,3.364 C -0.694,-1.109 0,0 0,0"/></g><g transform="translate(9.4687,17.4219)" id="g44"><path id="path46" style="fill:#63b0e2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.531,1.828 0.031,3.328 0.031,3.328 0,0 -0.828,-0.25 -1.75,0.016 -0.922,0.265 -1.297,-0.188 -1.297,-0.188 0,0 -0.375,0.453 -1.296,0.188 -0.922,-0.266 -1.75,-0.016 -1.75,-0.016 0,0 0.562,-1.5 0.031,-3.328 -0.531,-1.828 0.765,-2.094 1.64,-2.078 0.875,0.015 1.375,-0.485 1.375,-0.485 0,0 0.5,0.5 1.375,0.485 C -0.766,-2.094 0.531,-1.828 0,0"/></g><g transform="translate(8.5469,16.1094)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.906 0.203,0 0,0.36 -0.219,0 0,0.968 0.203,0 -1.671,1.11 0,0.453 0.25,0 -0.86,0.578 -0.859,-0.578 0.25,0 0,-0.453 -1.672,-1.11 0.203,0 0,-0.968 -0.219,0 0,-0.36 0.204,0 0,-0.906 -0.25,0 0,-0.453 2.343,0 2.344,0 L 0.25,0 0,0 Z"/></g><g transform="translate(8.7109,19.8828)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.358 -0.073,-0.492 -0.164,-0.492 -0.091,0 -0.164,0.134 -0.164,0.492 0,0.358 0.164,0.648 0.164,0.648 C -0.164,0.648 0,0.358 0,0"/></g><g transform="translate(9.1797,19.3437)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.266,0 c 0,0.172 0.284,0.312 0.633,0.312 C -0.283,0.312 0,0.172 0,0"/></g><g transform="translate(4.875,19.8125)" id="g60"><path id="path62" style="fill:#018830;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.234,-0.422 -0.281,-0.672 -0.047,-0.25 -0.188,0.156 -0.188,0.156 0,0 -0.25,-0.25 -0.312,-0.343 -0.063,-0.094 -0.078,0.718 0,0.828 0.078,0.109 -0.188,0.078 -0.281,0.125 -0.094,0.047 0.203,0.343 0.203,0.343 0,0 -0.407,0.188 -0.266,0.235 0.141,0.047 0.656,0.015 0.828,-0.125 0.172,-0.141 0.578,0.094 0.734,0.125 0.157,0.031 0,-0.156 -0.125,-0.266 C 0.187,0.297 0.25,0.016 0.25,-0.125 0.25,-0.266 0,0 0,0"/></g><path id="path64" style="fill:#b6b6b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7.422,17.266 -1.844,0 0,0.531 1.844,0 0,-0.531 z"/><path id="path66" style="fill:#b6b6b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 5.25,17.5 -0.562,0 0,0.734 0.562,0 0,-0.734 z"/><path id="path68" style="fill:#b6b6b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 5.25,16.266 -0.562,0 0,0.734 0.562,0 0,-0.734 z"/><path id="path70" style="fill:#b6b6b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 8.266,17.5 -0.562,0 0,0.734 0.562,0 0,-0.734 z"/><path id="path72" style="fill:#b6b6b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 8.266,16.266 -0.562,0 0,0.734 0.562,0 0,-0.734 z"/><path id="path74" style="fill:#b6b6b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 6.891,19.391 -0.844,0 0,0.391 0.844,0 0,-0.391 z"/><g transform="translate(11.5,17.2344)" id="g76"><path id="path78" style="fill:#fada10;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.156,0.891 -0.828,-0.266 0.25,-1.203 0.187,-0.047 c 0,0 0.016,-0.969 -0.719,-1.719 -0.734,-0.75 -2.031,-0.75 -2.031,-0.75 0,0 -0.672,-0.484 -1.75,-0.484 -1.078,0 -1.75,0.484 -1.75,0.484 0,0 -1.297,0 -2.031,0.75 -0.735,0.75 -0.719,1.719 -0.719,1.719 l 0.188,0.047 0.25,1.203 L -9.938,0.891 -10.094,0 -10.391,-0.031 c 0,0 0.016,-1.75 0.625,-2.672 0.61,-0.922 1.969,-1.203 1.969,-1.203 0,0 0.016,-0.11 0.047,-0.219 0.891,-0.516 2.703,-0.547 2.703,-0.547 0,0 1.813,0.031 2.703,0.547 0.031,0.109 0.047,0.219 0.047,0.219 0,0 1.36,0.281 1.969,1.203 0.609,0.922 0.625,2.672 0.625,2.672 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#032A87" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#DC181E" d="M32 5H4C1.791 5 0 6.791 0 9v9h36V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M1.313 29.945l15.718-11.881L1.33 6.041C.519 6.773 0 7.822 0 9v18c0 1.171.512 2.214 1.313 2.945z"/><path fill="#FADA10" d="M8.625 14.739c0 .915-.962 1.657-2.148 1.657-1.187 0-2.148-.742-2.148-1.657s.962-1.656 2.148-1.656c1.186 0 2.148.742 2.148 1.656z"/><path fill="#BD725F" d="M3.854 14.042c.46-.46 2.119-.438 2.622-.146-.56-.754.212-.396.816-.396.604-.001.771.186.375.228-.396.043-.729-.02-.625.105.104.125.709.019 1.25-.105.542-.124 1.166.334 1.208.418s-.958-.125-1.312 0-.917.104-.875.229-.589.208-.836.146-1.269-.042-1.102-.146.375-.229.458-.271c.084-.042-1.25-.083-1.979-.062z"/><path fill="#DC181E" d="M10.156 14.562s-.939.477-1.891.25c-1.047-.25-1.812-.139-1.812.141 0-.28-.766-.391-1.812-.141-.951.227-1.891-.25-1.891-.25s.694 1.109.281 3.328c-.422 2.266-.297 3.297 1.49 3.364 1.511.057 1.932.511 1.932.511s.421-.454 1.932-.511c1.787-.067 1.912-1.099 1.49-3.364-.413-2.218.281-3.328.281-3.328z"/><path fill="#63B0E2" d="M9.469 18.578c-.531-1.828.031-3.328.031-3.328s-.828.25-1.75-.016-1.297.188-1.297.188-.375-.453-1.297-.188c-.922.266-1.75.016-1.75.016s.562 1.5.031 3.328c-.531 1.828.766 2.094 1.641 2.078.875-.016 1.375.484 1.375.484s.5-.5 1.375-.484c.875.016 2.172-.25 1.641-2.078z"/><path fill="#FFF" d="M8.547 19.891v-.907h.203v-.359h-.219v-.969h.203l-1.672-1.109v-.453h.25l-.859-.578-.859.578h.25v.453l-1.672 1.109h.203v.969h-.219v.359h.203v.907h-.25v.453h4.688v-.453zm.164-3.774c0 .358-.073.492-.164.492-.091 0-.164-.134-.164-.492s.164-.648.164-.648.164.29.164.648z"/><path fill="#FFF" d="M9.18 16.656H7.914c0-.172.283-.312.633-.312.349 0 .633.14.633.312z"/><path fill="#018830" d="M4.875 16.188s-.234.422-.281.672c-.047.25-.188-.156-.188-.156s-.25.25-.312.344c-.062.094-.078-.719 0-.828.078-.109-.188-.078-.281-.125-.094-.047.203-.344.203-.344s-.406-.188-.266-.234c.141-.047.656-.016.828.125.172.141.578-.094.734-.125.156-.031 0 .156-.125.266-.125.109-.062.391-.062.531s-.25-.126-.25-.126z"/><path fill="#B6B6B6" d="M5.578 18.203h1.844v.531H5.578zm-.89-.437h.562v.734h-.562zm0 1.234h.562v.734h-.562zm3.015-1.234h.562v.734h-.562zm0 1.234h.562v.734h-.562zm-1.656-2.781h.844v.391h-.844z"/><path fill="#FADA10" d="M11.5 18.766l-.156-.891-.828.266.25 1.203.188.047s.016.969-.719 1.719-2.031.75-2.031.75-.672.484-1.75.484c-1.078 0-1.75-.484-1.75-.484s-1.297 0-2.031-.75c-.734-.75-.719-1.719-.719-1.719l.188-.047.25-1.203-.828-.266-.156.891-.297.031s.016 1.75.625 2.672c.609.922 1.969 1.203 1.969 1.203s.016.109.047.219c.891.516 2.703.547 2.703.547s1.812-.031 2.703-.547c.031-.109.047-.219.047-.219s1.359-.281 1.969-1.203c.609-.922.625-2.672.625-2.672l-.299-.031z"/></svg>
\ No newline at end of file