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/1f54c.svg b/public/emoji/1f54c.svg
index 446c3c6f1..6ef551653 100644
--- a/public/emoji/1f54c.svg
+++ b/public/emoji/1f54c.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(23,31.6743)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.368 -9.837,-6.652 -9.837,-13.206 0,-2.184 1.085,-4.468 2.177,-4.468 l 7.66,0 7.631,0 c 1.093,0 2.192,2.284 2.192,4.468 C 9.823,-6.652 0,-4.368 0,0"/></g><g transform="translate(35,2.1846)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.207 -0.289,-2.185 -2.185,-2.185 l -19.659,0 C -23.74,-2.185 -24,-1.207 -24,0 l 0,10.922 c 0,1.206 0.26,1.893 2.156,1.893 l 19.659,0 C -0.289,12.815 0,12.128 0,10.922 L 0,0 Z"/></g><g transform="translate(23,2)" id="g28"><path id="path30" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -18,0 c -1.104,0 -2,0.895 -2,2 l 0,1 c 0,1.105 0.896,2 2,2 L -2,3 C -0.895,3 0,2.105 0,1 L 0,0 Z"/></g><g transform="translate(26,7)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3 -1.895,5 -3,5 -4.104,5 -6,3 -6,0 l 0,-7 2,0 2,0 2,0 0,7 z"/></g><g transform="translate(18,4.667)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2 -1.264,3.333 -2,3.333 -2.736,3.333 -4,2 -4,0 l 0,-4.667 1.333,0 1.334,0 1.333,0 L 0,0 Z"/></g><g transform="translate(32,4.667)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2 -1.264,3.333 -2,3.333 -2.736,3.333 -4,2 -4,0 l 0,-4.667 1.334,0 1.332,0 1.334,0 L 0,0 Z"/></g><g transform="translate(9,2)" id="g44"><path id="path46" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 l -2,0 c -1.104,0 -2,0.895 -2,2 l 0,26 c 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 L 0,0 Z"/></g><g transform="translate(5.9951,35.6743)" id="g48"><path id="path50" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.837 -2.832,-2.918 -2.832,-5.675 0,-0.919 0.312,-1.999 0.627,-1.999 l 2.205,0 2.197,0 c 0.314,0 0.631,1.08 0.631,1.999 C 2.828,-2.918 0,-1.837 0,0"/></g><g transform="translate(10,24)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 l -6,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 6,0 C -0.448,1 0,0.552 0,0"/></g><g transform="translate(10,28)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 l -6,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 6,0 C -0.448,1 0,0.552 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M23 4.326c0 4.368-9.837 6.652-9.837 13.206 0 2.184 1.085 4.468 2.177 4.468h15.291c1.093 0 2.192-2.284 2.192-4.468C32.823 10.977 23 8.694 23 4.326z"/><path fill="#FFD983" d="M35 33.815C35 35.022 34.711 36 32.815 36h-19.66C11.26 36 11 35.022 11 33.815V22.894c0-1.206.26-1.894 2.156-1.894h19.66c1.895 0 2.184.688 2.184 1.894v10.921z"/><path fill="#FFD983" d="M23 34c0 1.104-.896 2-2 2H3c-1.104 0-2-.896-2-2v-1c0-1.104.896-2 2-2h18c1.104 0 2 .896 2 2v1z"/><path fill="#662113" d="M26 29c0-3-1.896-5-3-5s-3 2-3 5v7h6v-7zm-8 2.333c0-2-1.264-3.333-2-3.333s-2 1.333-2 3.333V36h4v-4.667zm14 0c0-2-1.264-3.333-2-3.333s-2 1.333-2 3.333V36h4v-4.667z"/><path fill="#FFD983" d="M9 34c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2V8c0-1.104.896-2 2-2h2c1.104 0 2 .896 2 2v26z"/><path fill="#F4900C" d="M5.995.326c0 1.837-2.832 2.918-2.832 5.675 0 .919.312 2 .627 2h4.402c.314 0 .631-1.081.631-2 0-2.757-2.828-3.838-2.828-5.675z"/><path fill="#FFAC33" d="M10 12c0 .552-.448 1-1 1H3c-.552 0-1-.448-1-1s.448-1 1-1h6c.552 0 1 .448 1 1zm0-4c0 .552-.448 1-1 1H3c-.552 0-1-.448-1-1s.448-1 1-1h6c.552 0 1 .448 1 1z"/></svg>
\ No newline at end of file