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/1f435.svg b/public/emoji/1f435.svg
index 671de74ec..ee6c57cf9 100644
--- a/public/emoji/1f435.svg
+++ b/public/emoji/1f435.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="clipPath52" clipPathUnits="userSpaceOnUse"><path id="path54" 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,29)" id="g20"><path id="path22" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4.939 -6.772,4.457 -9.169,4.132 -11.602,5.921 -14.556,7 -18,7 -21.438,7 -24.388,5.919 -26.818,4.131 -29.203,4.456 -36,4.948 -36,0 c 0,-2.891 1.563,-4.732 2.433,-5.533 C -34.514,-8.26 -35,-11.175 -35,-14 c 0,-9.941 10,-13 17,-13 7,0 17,3 17,13 0,2.835 -0.483,5.751 -1.426,8.473 C -1.555,-4.722 0,-2.883 0,0"/></g><g transform="translate(18,17)" id="g24"><path id="path26" style="fill:#d79e84;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.038,0 -0.074,-0.005 -0.111,-0.006 -0.074,0.031 -0.037,0.067 0,0.105 0.037,0.067 0.074,0.031 0.111,-0.006 0.074,-0.005 0.038,0 0,0 M 12,5 C 12,8.866 8.866,12 5,12 3.04,12 1.271,11.192 0,9.895 -1.27,11.192 -3.04,12 -5,12 -8.866,12 -12,8.866 -12,5 -12,1.223 -9.007,-1.846 -5.265,-1.986 -6.938,-3.453 -8,-5.6 -8,-8 c 0,-4.419 3.581,-8 8,-8 4.419,0 8,3.581 8,8 0,2.4 -1.061,4.547 -2.734,6.014 C 9.008,-1.846 12,1.223 12,5"/></g><g transform="translate(18,2.5)" id="g28"><path id="path30" style="fill:#642116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.271,0 -5.36,4.102 -5.447,4.276 -5.525,4.432 -5.517,4.615 -5.425,4.763 -5.334,4.91 -5.173,5 -5,5 L 5,5 C 5.173,5 5.334,4.91 5.426,4.763 5.517,4.615 5.524,4.432 5.447,4.276 5.36,4.102 3.271,0 0,0"/></g><g transform="translate(17,10.5)" id="g32"><path id="path34" style="fill:#642116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,2 C -0.5,2.776 -0.276,3 0,3 0.276,3 0.5,2.776 0.5,2.5 l 0,-2 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(19,10.5)" id="g36"><path id="path38" style="fill:#642116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,2 C -0.5,2.776 -0.276,3 0,3 0.276,3 0.5,2.776 0.5,2.5 l 0,-2 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(15,20)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -0.895,-3 -2,-3 -1.104,0 -2,1.344 -2,3 0,1.657 0.896,3 2,3 1.105,0 2,-1.343 2,-3"/></g><g transform="translate(25,20)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -0.895,-3 -2,-3 -1.104,0 -2,1.344 -2,3 0,1.657 0.896,3 2,3 1.105,0 2,-1.343 2,-3"/></g></g></g><g id="g48"><g clip-path="url(#clipPath52)" id="g50"><g transform="translate(19,17)" id="g56"><path id="path58" style="fill:#d79e84;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.553,0 1,-0.447 1,-1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse transform="rotate(-14.999 5.05 17.456)" fill="#D79E84" cx="5.05" cy="17.455" rx="3.818" ry="5.455"/><ellipse transform="rotate(-75.001 31.05 17.455)" fill="#D79E84" cx="31.05" cy="17.455" rx="5.455" ry="3.818"/><path fill="#BF6952" d="M19.018 36h-2.036C10.264 36 3.75 30.848 3.75 23.636c0-4.121 1.527-6.182 1.527-6.182s-.509-2.061-.509-4.121C4.768 7.152 11.282 2 18 2c6.718 0 13.232 6.182 13.232 11.333 0 2.061-.509 4.121-.509 4.121s1.527 2.061 1.527 6.182C32.25 30.848 25.736 36 19.018 36z"/><path fill="#D79E84" d="M30 16.042C30 12.153 26.825 9 22.909 9c-1.907 0-3.635.752-4.909 1.968C16.726 9.752 14.998 9 13.091 9 9.175 9 6 12.153 6 16.042c0 2.359 1.172 4.441 2.965 5.719-.503 1.238-.783 2.6-.783 4.031C8.182 31.476 12.578 35 18 35s9.818-3.524 9.818-9.208c0-1.431-.28-2.793-.783-4.031C28.828 20.483 30 18.4 30 16.042z"/><ellipse fill="#292F33" cx="13" cy="17" rx="2.25" ry="3.25"/><ellipse fill="#292F33" cx="23" cy="17" rx="2.25" ry="3.25"/><path fill="#642116" d="M18 32.727c2.838 0 5.254-1.505 6.162-3.61.375-.871-.262-1.844-1.21-1.844h-9.904c-.948 0-1.585.974-1.21 1.844.908 2.105 3.324 3.61 6.162 3.61z"/><circle fill="#642116" cx="16.25" cy="23" r="1"/><circle fill="#642116" cx="19.75" cy="23" r="1"/><path fill="#BF6952" d="M22.66.175s-5.455-1.091-7.636 2.182 4.364 1.091 4.364 1.091S20.478.175 22.66.175z"/></svg>
\ No newline at end of file