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/1f355.svg b/public/emoji/1f355.svg
index 1bd819aca..3a44bba9a 100644
--- a/public/emoji/1f355.svg
+++ b/public/emoji/1f355.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="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 5.727,30.382 C 5.25,30.149 5.188,29.542 5.313,29.104 l 0,0 C 5.438,28.667 16,2 16,2 l 0,0 c 0,0 1,-2 2,-2 l 0,0 c 1.104,0 2,2 2,2 l 0,0 10.704,27.22 c 0,0 0.213,0.843 -0.569,1.229 l 0,0 C 28.391,31.311 24.047,33 18,33 l 0,0 C 11.787,33 7.385,31.19 5.727,30.382"/></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(18,32)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 7.257,0 13,-4 14.699,-2 14.896,-1.677 15,-1.343 15,-1 15,1 8.284,4 0,4 -8.284,4 -15,1 -15,-1 c 0,-0.343 0.104,-0.677 0.301,-1 C -13,-4 -7.257,0 0,0"/></g><g transform="translate(18,33)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.213,0 -10.616,-1.81 -12.273,-2.618 -0.477,-0.233 -0.54,-0.84 -0.415,-1.278 C -12.563,-4.333 -2,-31 -2,-31 c 0,0 0.896,-2 2,-2 1.105,0 2,2 2,2 l 10.704,27.221 c 0,0 0.213,0.841 -0.569,1.228 C 10.392,-1.689 6.047,0 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(18,5)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.208 -1.791,-4 -4,-4 -2.209,0 -4,1.792 -4,4 0,2.208 1.791,4 4,4 2.209,0 4,-1.792 4,-4"/></g><g transform="translate(17,16)" id="g40"><path id="path42" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.208 -1.792,-4 -4,-4 -2.209,0 -4,1.792 -4,4 0,2.209 1.791,4 4,4 2.208,0 4,-1.791 4,-4"/></g><g transform="translate(20,28)" id="g44"><path id="path46" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.792,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.208,0 4,-1.791 4,-4"/></g><g transform="translate(29,23)" id="g48"><path id="path50" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.792,-4 -4,-4 -2.208,0 -4,1.791 -4,4 0,2.209 1.792,4 4,4 2.208,0 4,-1.791 4,-4"/></g><g transform="translate(27,11)" id="g52"><path id="path54" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.208 -1.792,-4 -4,-4 -2.208,0 -4,1.792 -4,4 0,2.208 1.792,4 4,4 2.208,0 4,-1.792 4,-4"/></g><g transform="translate(10,24)" id="g56"><path id="path58" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M18 4c7.257 0 13 4 14.699 2 .197-.323.301-.657.301-1 0-2-6.716-5-15-5C9.716 0 3 3 3 5c0 .343.104.677.301 1C5 8 10.743 4 18 4z"/><path fill="#FFCC4D" d="M18 3C11.787 3 7.384 4.81 5.727 5.618c-.477.233-.539.84-.415 1.278S16 34 16 34s.896 2 2 2 2-2 2-2L30.704 6.779s.213-.842-.569-1.229C28.392 4.689 24.047 3 18 3z"/><g fill="#BE1931"><path d="M18 31c0-2.208-1.791-4-4-4-.254 0-.5.029-.741.075L16 34s.071.14.19.342C17.279 33.627 18 32.399 18 31zm-1-11c0-2.209-1.792-4-4-4-1.426 0-2.67.752-3.378 1.876l2.362 5.978c.327.086.663.146 1.016.146 2.208 0 4-1.792 4-4z"/><circle cx="16" cy="8" r="4"/><path d="M25 9c-2.208 0-4 1.791-4 4s1.792 4 4 4c.682 0 1.315-.187 1.877-.488l1.89-4.806C28.227 10.135 26.752 9 25 9zm-6 16c0 1.868 1.288 3.425 3.019 3.864l2.893-7.357C24.342 21.194 23.697 21 23 21c-2.208 0-4 1.792-4 4zm-9-13c0-2.209-1.791-4-4-4-.087 0-.169.02-.255.026.55 1.412 1.575 4.016 2.775 7.057C9.416 14.349 10 13.248 10 12z"/></g></svg>
\ No newline at end of file