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/1f9d5-1f3fd.svg b/public/emoji/1f9d5-1f3fd.svg
index bc4cac0dc..c31d2fc30 100644
--- a/public/emoji/1f9d5-1f3fd.svg
+++ b/public/emoji/1f9d5-1f3fd.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(31,0)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(27.2352,19.2393)" id="g24"><path id="path26" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,8.494 -5.309,11.026 -9.229,11.026 -3.92,0 -9.801,-2.559 -9.801,-11.026 0,-3.489 1.255,-6.182 0.644,-8.238 -1.199,-4.038 2.929,-7.507 6.151,-9.001 4.94,-2.291 10,3 10,3 C 1.74,-14.239 0,-9.991 0,0"/></g><g transform="translate(27.8069,19.2393)" id="g28"><path id="path30" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,8.494 -5.88,11.761 -9.801,11.761 -3.92,0 -9.8,-3.294 -9.8,-11.761 0,-8.494 7.187,-11.761 11.107,-11.761 2.939,0 3.752,-1.478 5.687,-1.478 C 2.475,-13.239 0,-8.821 0,0"/></g><g transform="translate(16.9037,24.8338)" id="g32"><path id="path34" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.167,-0.265 -6.558,-3.877 -6.719,-5.799 0.2,-5.341 3.62,-9.596 7.822,-9.596 4.177,0 7.583,4.208 7.817,9.507 C 8.69,-3.516 2.001,0.245 0,0"/></g><g transform="translate(17.9443,12.457)" id="g36"><path id="path38" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.605,0 -2.446,0.794 -2.536,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.265,0.264 0.692,0.266 0.96,0.006 C -1.541,1.826 -1.023,1.367 0,1.367 1.039,1.367 1.557,1.84 1.577,1.859 1.851,2.115 2.28,2.107 2.54,1.84 2.8,1.571 2.8,1.148 2.536,0.885 2.446,0.794 1.606,0 0,0"/></g><g transform="translate(14.6084,18.1138)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.847,-0.381 0.847,-0.846 l 0,-0.845 C 0.847,0.381 0.465,0 0,0"/></g><g transform="translate(21.373,18.1138)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.845 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(18.8369,15.5)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.691,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.114,0.81 -1.925,1 -1.691,1 L 0,1 C 0.232,1 0.423,0.81 0.423,0.576 l 0,-0.153 C 0.423,0.189 0.232,0 0,0"/></g><g transform="translate(10,19)" id="g52"><path id="path54" style="fill:#553788;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3,5 8,5 13,5 16,0 16,0 16,0 15,8 8,8 1,8 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M31 36v-3.5c0-3.314-3.685-5.5-7-5.5H12c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#744EAA" d="M27.235 16.761c0-8.494-5.309-11.026-9.229-11.026s-9.8 2.559-9.8 11.026c0 3.489 1.255 6.182.644 8.238C7.65 29.037 11.778 32.506 15 34c4.94 2.29 10-3 10-3 3.975 0 2.235-4.248 2.235-14.239z"/><path fill="#9266CC" d="M27.807 16.761C27.807 8.267 21.926 5 18.006 5s-9.8 3.294-9.8 11.761c0 8.494 7.187 11.761 11.107 11.761C22.252 28.521 23.065 30 25 30c5.281 0 2.807-4.419 2.807-13.239z"/><path fill="#D5AB88" d="M16.904 11.166c-2.167.265-6.558 3.877-6.719 5.799.2 5.341 3.62 9.596 7.821 9.596 4.178 0 7.583-4.208 7.818-9.507-.23-2.372-6.919-6.133-8.92-5.888z"/><path fill="#DF1F32" d="M17.944 23.543c-1.605 0-2.446-.794-2.536-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.96-.007.035.032.553.491 1.576.491 1.039 0 1.557-.473 1.577-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.536.885"/><path fill="#662113" d="M14.608 17.886c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846s.847.381.847.846v.845c0 .465-.382.846-.847.846m6.765 0c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .465-.381.846-.846.846"/><path fill="#C1694F" d="M18.837 20.5h-1.691c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.691c.232 0 .423.19.423.424v.153c0 .233-.191.423-.423.423"/><path fill="#553788" d="M10 17s3-5 8-5 8 5 8 5-1-8-8-8-8 8-8 8z"/></svg>
\ No newline at end of file