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/1f54b.svg b/public/emoji/1f54b.svg
index 92bc70f83..3cd63ee3d 100644
--- a/public/emoji/1f54b.svg
+++ b/public/emoji/1f54b.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="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" 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 transform="translate(18,36)" id="g12"><path id="path14" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,-5 0,-29 18,-2 18,2 0,29 -18,5 z"/></g><g transform="translate(18,36)" id="g16"><path id="path18" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-36 18,2 0,29 -18,5 z"/></g><g transform="translate(22.4541,21.4929)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.407 4.229,-0.612 0,3.306 L 0,0 Z"/></g><g transform="translate(29.4536,20.3124)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.24 3.299,-0.477 0,3.161 L 0,0 Z"/></g><g transform="translate(18,22.2441)" id="g28"><path id="path30" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.513 1.683,-0.244 0,3.473 L 0,0 Z"/></g><g transform="translate(35.4609,16.2027)" id="g32"><path id="path34" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.539,-0.077 0,3.083 L 0,3.097 0,0 Z"/></g><g transform="translate(0,19.2087)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.083 0.539,0.077 0,3.097 L 0,0 Z"/></g><g transform="translate(16.3168,21.9603)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.473 1.683,0.244 0,3.513 L 0,0 Z"/></g><g transform="translate(3.2474,19.756)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.161 3.299,0.478 0,3.239 L 0,0 Z"/></g><g transform="translate(9.3173,20.7798)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.306 4.229,0.612 0,3.407 L 0,0 Z"/></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(21.3886,20.869)" id="g60"><path id="path62" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.042 c 0,0.421 -0.143,0.763 -0.32,0.763 -0.177,0 -0.32,-0.342 -0.32,-0.763 L -0.64,0 c -0.208,-0.217 -0.354,-0.621 -0.354,-1.103 0,-0.513 0.162,-0.949 0.392,-1.152 0.064,-0.195 0.164,-0.33 0.282,-0.33 0.118,0 0.218,0.135 0.282,0.33 0.23,0.203 0.393,0.639 0.393,1.152 C 0.355,-0.621 0.208,-0.217 0,0"/></g><g transform="translate(28.3881,19.7999)" id="g64"><path id="path66" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.042 c 0,0.421 -0.143,0.763 -0.32,0.763 -0.177,0 -0.32,-0.342 -0.32,-0.763 L -0.64,0 c -0.208,-0.217 -0.354,-0.621 -0.354,-1.103 0,-0.513 0.162,-0.949 0.392,-1.152 0.064,-0.195 0.164,-0.33 0.282,-0.33 0.118,0 0.218,0.135 0.282,0.33 0.23,0.203 0.393,0.639 0.393,1.152 C 0.355,-0.621 0.208,-0.217 0,0"/></g><g transform="translate(34.4055,18.7699)" id="g68"><path id="path70" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.039 c 0,0.393 -0.134,0.712 -0.299,0.712 -0.165,0 -0.298,-0.319 -0.298,-0.712 l 0,-0.039 c -0.195,-0.203 -0.331,-0.58 -0.331,-1.03 0,-0.479 0.151,-0.886 0.366,-1.075 0.06,-0.182 0.153,-0.309 0.263,-0.309 0.111,0 0.204,0.127 0.263,0.309 0.216,0.189 0.367,0.596 0.367,1.075 C 0.331,-0.58 0.194,-0.203 0,0"/></g><g transform="translate(14.6114,20.869)" id="g72"><path id="path74" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.042 c 0,0.421 0.143,0.763 0.32,0.763 0.177,0 0.32,-0.342 0.32,-0.763 L 0.64,0 c 0.208,-0.217 0.354,-0.621 0.354,-1.103 0,-0.513 -0.162,-0.949 -0.392,-1.152 -0.064,-0.195 -0.164,-0.33 -0.282,-0.33 -0.118,0 -0.218,0.135 -0.282,0.33 -0.23,0.203 -0.393,0.639 -0.393,1.152 0,0.482 0.147,0.886 0.355,1.103"/></g><g transform="translate(7.6119,19.7999)" id="g76"><path id="path78" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.042 c 0,0.421 0.143,0.763 0.32,0.763 0.177,0 0.32,-0.342 0.32,-0.763 L 0.64,0 c 0.208,-0.217 0.354,-0.621 0.354,-1.103 0,-0.513 -0.162,-0.949 -0.392,-1.152 -0.064,-0.195 -0.164,-0.33 -0.282,-0.33 -0.118,0 -0.218,0.135 -0.282,0.33 -0.23,0.203 -0.393,0.639 -0.393,1.152 0,0.482 0.147,0.886 0.355,1.103"/></g><g transform="translate(1.5945,18.7699)" id="g80"><path id="path82" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.039 c 0,0.393 0.134,0.712 0.299,0.712 0.165,0 0.298,-0.319 0.298,-0.712 L 0.597,0 c 0.195,-0.203 0.331,-0.58 0.331,-1.03 0,-0.479 -0.151,-0.886 -0.366,-1.075 -0.06,-0.182 -0.153,-0.309 -0.263,-0.309 -0.111,0 -0.204,0.127 -0.263,0.309 -0.216,0.189 -0.367,0.596 -0.367,1.075 0,0.45 0.137,0.827 0.331,1.03"/></g><g transform="translate(0,24.8543)" id="g84"><path id="path86" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-3.5 18,-0.232 18,3.531 0,0 Z"/></g><g transform="translate(18,28.3855)" id="g88"><path id="path90" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.763 18,-3.268 0,3.5 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M18 0L0 5v29l18 2 18-2V5z"/><path fill="#292F33" d="M18 36l18-2V5L18 0z"/><path fill="#FFD983" d="M22.454 14.507v3.407l4.229.612V15.22zm7 1.181v3.239l3.299.478v-3.161zM18 13.756v3.513l1.683.244V14.04zm18 3.036l-.539-.091v3.096l.539.078z"/><path fill="#FFAC33" d="M0 16.792v3.083l.539-.078v-3.096zm16.317-2.752v3.473L18 17.269v-3.513zm-13.07 2.204v3.161l3.299-.478v-3.239zm6.07-1.024v3.306l4.229-.612v-3.407z"/><path fill="#FFD983" d="M21.389 15.131v-.042c0-.421-.143-.763-.32-.763-.177 0-.32.342-.32.763v.042c-.208.217-.355.621-.355 1.103 0 .513.162.949.393 1.152.064.195.163.33.282.33s.218-.135.282-.33c.231-.203.393-.639.393-1.152-.001-.482-.147-.886-.355-1.103zm6.999 1.069v-.042c0-.421-.143-.763-.32-.763-.177 0-.32.342-.32.763v.042c-.208.217-.355.621-.355 1.103 0 .513.162.949.393 1.152.064.195.163.33.282.33s.218-.135.282-.33c.231-.203.393-.639.393-1.152 0-.481-.147-.885-.355-1.103zm6.017 1.03v-.039c0-.393-.134-.712-.299-.712-.165 0-.299.319-.299.712v.039c-.194.203-.331.58-.331 1.03 0 .479.151.886.367 1.076.059.182.152.308.263.308s.203-.126.263-.308c.215-.189.367-.597.367-1.076 0-.45-.136-.827-.331-1.03z"/><path fill="#FFAC33" d="M14.611 15.131v-.042c0-.421.143-.763.32-.763s.32.342.32.763v.042c.208.217.355.621.355 1.103 0 .513-.162.949-.393 1.152-.064.195-.163.33-.282.33s-.218-.135-.282-.33c-.231-.203-.393-.639-.393-1.152.001-.482.147-.886.355-1.103zM7.612 16.2v-.042c0-.421.143-.763.32-.763s.32.342.32.763v.042c.208.217.355.621.355 1.103 0 .513-.162.949-.393 1.152-.064.195-.163.33-.282.33s-.218-.135-.282-.33c-.231-.203-.393-.639-.393-1.152 0-.481.147-.885.355-1.103zm-6.017 1.03v-.039c0-.393.134-.712.299-.712s.299.319.299.712v.039c.194.203.331.58.331 1.03 0 .479-.151.886-.367 1.076-.059.182-.152.308-.263.308s-.204-.127-.264-.308c-.215-.189-.367-.597-.367-1.076.001-.45.137-.827.332-1.03zM0 11.146v3.5l18-3.268V7.614z"/><path fill="#FFD983" d="M18 7.614v3.764l18 3.268v-3.5z"/></svg>
\ No newline at end of file