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/1f519.svg b/public/emoji/1f519.svg
index d723bae40..08e031266 100644
--- a/public/emoji/1f519.svg
+++ b/public/emoji/1f519.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(34,32.9995)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -21.525,0 0,1.873 c 0,1.046 -0.741,1.434 -1.645,0.865 l -10.14,-6.389 c -0.905,-0.57 -0.922,-1.527 -0.038,-2.128 l 10.216,-6.931 c 0.884,-0.602 1.607,-0.235 1.607,0.811 l 0,1.899 L 0,-10 c 1.104,0 2,0.896 2,2 l 0,6 C 2,-0.896 1.104,0 0,0"/></g><g transform="translate(2.2974,2.165)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.788,0 c 0.818,0 1.424,0.47 1.424,1.318 0,0.712 -0.545,1.198 -1.606,1.198 L 0,2.516 0,0 Z m 0,4.516 1.182,0 c 0.742,0 1.227,0.439 1.227,1.196 0,0.713 -0.56,1.076 -1.227,1.076 L 0,6.788 0,4.516 Z m -2.273,3.135 c 0,0.728 0.5,1.137 1.197,1.137 l 2.909,0 c 1.576,0 2.849,-1.06 2.849,-2.667 0,-1.06 -0.439,-1.772 -1.409,-2.226 l 0,-0.031 C 4.561,3.682 5.576,2.606 5.576,1.288 5.576,-0.849 4.152,-2 2.061,-2 l -3.122,0 c -0.697,0 -1.212,0.439 -1.212,1.151 l 0,8.5 z"/></g><g transform="translate(11.6816,4.377)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2.879,0 -1.41,4.395 -0.03,0 L 0,0 Z m -0.168,5.501 c 0.258,0.696 0.85,1.257 1.621,1.257 0.805,0 1.365,-0.53 1.621,-1.257 l 2.971,-8.243 c 0.092,-0.242 0.121,-0.454 0.121,-0.561 0,-0.591 -0.484,-1 -1.045,-1 -0.637,0 -0.955,0.333 -1.107,0.788 l -0.453,1.424 -4.213,0 -0.455,-1.409 c -0.151,-0.47 -0.469,-0.803 -1.09,-0.803 -0.607,0 -1.122,0.454 -1.122,1.061 0,0.242 0.076,0.424 0.107,0.5 l 3.044,8.243 z"/></g><g transform="translate(23.0596,11.1348)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.106,0 3.258,-0.363 3.258,-1.696 0,-0.546 -0.379,-1.016 -0.94,-1.016 -0.621,0 -1.046,0.53 -2.318,0.53 -1.879,0 -2.849,-1.59 -2.849,-3.439 0,-1.803 0.986,-3.349 2.849,-3.349 1.272,0 1.788,0.637 2.409,0.637 0.682,0 1,-0.682 1,-1.03 0,-1.455 -2.288,-1.788 -3.409,-1.788 -3.076,0 -5.212,2.439 -5.212,5.576 C -5.212,-2.424 -3.091,0 0,0"/></g><g transform="translate(27.5313,9.9229)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.621 0.455,1.121 1.137,1.121 1.788,1.121 2.273,0.697 2.273,0 l 0,-3.273 L 6,0.697 C 6.167,0.879 6.455,1.121 6.879,1.121 7.455,1.121 8,0.682 8,0.03 8,-0.363 7.758,-0.682 7.258,-1.182 L 4.395,-4 l 3.5,-3.651 c 0.363,-0.365 0.636,-0.698 0.636,-1.153 0,-0.712 -0.561,-1.045 -1.182,-1.045 -0.44,0 -0.727,0.258 -1.152,0.712 l -3.924,4.243 0,-3.864 C 2.273,-9.349 1.818,-9.849 1.137,-9.849 0.485,-9.849 0,-9.425 0,-8.758 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M34 3H12.475V1.128c0-1.046-.74-1.435-1.645-.865L.69 6.652c-.905.57-.922 1.527-.038 2.127l10.215 6.931c.884.602 1.607.235 1.607-.811V13H34c1.104 0 2-.896 2-2V5c0-1.104-.896-2-2-2zM.024 26.184c0-.727.5-1.137 1.197-1.137H4.13c1.576 0 2.849 1.061 2.849 2.667 0 1.061-.439 1.772-1.409 2.227v.03c1.288.183 2.303 1.258 2.303 2.576 0 2.137-1.424 3.288-3.516 3.288h-3.12c-.697 0-1.212-.439-1.212-1.151v-8.5zm2.273 3.135h1.182c.742 0 1.227-.439 1.227-1.196 0-.713-.561-1.076-1.227-1.076H2.297v2.272zm0 4.516h1.788c.818 0 1.424-.47 1.424-1.318 0-.712-.545-1.197-1.606-1.197H2.297v2.515zm9.217-7.713c.258-.696.85-1.257 1.621-1.257.805 0 1.365.53 1.621 1.257l2.971 8.243c.092.242.121.454.121.561 0 .591-.484 1-1.045 1-.637 0-.955-.333-1.107-.788l-.453-1.424H11.03l-.455 1.409c-.15.47-.469.803-1.09.803-.607 0-1.122-.454-1.122-1.061 0-.242.076-.424.106-.5l3.045-8.243zm.168 5.501h2.879l-1.41-4.395h-.029l-1.44 4.395zm11.378-6.758c1.106 0 3.258.363 3.258 1.696 0 .546-.379 1.016-.94 1.016-.621 0-1.046-.53-2.318-.53-1.879 0-2.849 1.591-2.849 3.439 0 1.803.985 3.349 2.849 3.349 1.272 0 1.788-.637 2.409-.637.682 0 1 .682 1 1.03 0 1.455-2.288 1.788-3.409 1.788-3.076 0-5.212-2.439-5.212-5.576 0-3.151 2.121-5.575 5.212-5.575zm4.471 1.212c0-.621.455-1.121 1.137-1.121.651 0 1.137.424 1.137 1.121v3.273l3.727-3.97c.167-.182.455-.424.879-.424.576 0 1.121.439 1.121 1.091 0 .393-.242.712-.742 1.212l-2.863 2.818 3.5 3.651c.363.364.637.697.637 1.152 0 .712-.562 1.045-1.183 1.045-.44 0-.727-.258-1.151-.712l-3.924-4.243v3.864c0 .591-.455 1.091-1.137 1.091-.651 0-1.137-.424-1.137-1.091v-8.757z"/></svg>
\ No newline at end of file