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/1f301.svg b/public/emoji/1f301.svg
index 0ab7d698b..0f6781098 100644
--- a/public/emoji/1f301.svg
+++ b/public/emoji/1f301.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 4,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 37,-1 -38,0 0,38 38,0 0,-38 z"/><g transform="translate(10,0)" id="g22"><path id="path24" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,29 4,4 2,0 4,-4 L 10,0 0,0 Z"/></g><g transform="translate(33,25)" id="g26"><path id="path28" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1 -1.286,1 -1.286,1 L -7.714,1 C -7.714,1 -9,1.001 -9,0.001 L -9,-25 0,-25 0,0 Z"/></g><g transform="translate(28,19)" id="g30"><path id="path32" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1 -1,1 -1,1 l -8,0 c -1,0 -1,-1 -1,-1 l 0,-19 10,0 0,19 z"/></g><g transform="translate(6,22)" id="g34"><path id="path36" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,1 -1,1 l -5,0 0,-23 6,0 0,22 z"/></g><g transform="translate(12,16)" id="g38"><path id="path40" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,1 -1,1 l -6,0 c 0,0 -1,10e-4 -1,-1 l 0,-16 8,0 0,16 z"/></g><path id="path42" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,5 8,5 8,7 10,7 10,5 Z"/><path id="path44" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,13 -2,0 0,2 2,0 0,-2 z"/><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 8,9 6,9 6,11 8,11 8,9 Z"/><path id="path48" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,25 -2,0 0,2 2,0 0,-2 z"/><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,21 -2,0 0,2 2,0 0,-2 z"/><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,17 -2,0 0,2 2,0 0,-2 z"/><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,16 -2,0 0,2 2,0 0,-2 z"/><path id="path56" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24,12 -2,0 0,2 2,0 0,-2 z"/><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,6 -2,0 0,2 2,0 0,-2 z"/><path id="path60" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,22 -2,0 0,2 2,0 0,-2 z"/><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,18 -2,0 0,2 2,0 0,-2 z"/><g transform="translate(34,16)" id="g64"><path id="path66" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.125,0 -3.928,-1.33 -4.652,-3.198 -5.438,-1.887 -6.859,-1 -8.5,-1 -9.263,-1 -9.97,-1.207 -10.599,-1.542 -11.227,-0.611 -12.293,0 -13.5,0 -15.024,0 -16.308,-0.981 -16.788,-2.342 -17.316,-2.124 -17.893,-2 -18.5,-2 c -1.757,0 -3.263,-1.018 -4.004,-2.486 -0.604,0.3 -1.275,0.486 -1.996,0.486 -1.183,0 -2.25,-0.466 -3.054,-1.213 -0.767,0.961 -1.934,1.588 -3.258,1.588 -2.313,0 -4.188,-1.875 -4.188,-4.187 0,-2.313 1.875,-4.188 4.188,-4.188 0.995,0 1.897,0.361 2.616,0.942 0.812,-1.172 2.162,-1.942 3.696,-1.942 0.561,0 1.092,0.115 1.587,0.303 0.433,-0.192 0.909,-0.303 1.413,-0.303 1.4,0 2.599,0.828 3.159,2.016 1.132,0.041 2.155,0.494 2.924,1.22 0.546,-0.746 1.421,-1.236 2.417,-1.236 1.09,0 2.035,0.587 2.561,1.456 C -9.851,-9.828 -9.198,-10 -8.5,-10 c 1.831,0 3.399,1.098 4.103,2.668 C -3.558,-8.912 -1.914,-10 0,-10 c 2.762,0 5,2.238 5,5 0,2.762 -2.238,5 -5,5"/></g><g transform="translate(30,12.291)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.926,0 -5.429,-1.796 -6.475,-4.344 -6.65,-4.325 -6.82,-4.291 -7,-4.291 c -0.702,0 -1.369,-0.148 -1.976,-0.409 -0.733,0.855 -1.809,1.409 -3.024,1.409 -2.209,0 -4,-1.791 -4,-4 0,-0.05 0.013,-0.097 0.015,-0.146 -0.326,0.085 -0.662,0.146 -1.015,0.146 -0.876,0 -1.679,-0.289 -2.338,-0.767 -0.597,0.473 -1.342,0.767 -2.162,0.767 -0.198,0 -0.388,-0.026 -0.577,-0.059 -0.637,1.78 -2.321,3.059 -4.319,3.059 -2.542,0 -4.604,-2.061 -4.604,-4.605 0,-2.543 2.062,-4.604 4.604,-4.604 0.783,0 1.509,0.214 2.154,0.558 0.64,-0.816 1.624,-1.349 2.742,-1.349 0.546,0 1.057,0.136 1.517,0.359 0.733,-0.827 1.791,-1.359 2.983,-1.359 1.729,0 3.188,1.103 3.747,2.639 0.546,-0.398 1.213,-0.639 1.94,-0.639 0.387,0 0.752,0.079 1.097,0.2 0.871,-0.738 1.985,-1.2 3.216,-1.2 1.299,0 2.472,0.508 3.36,1.32 C -2.578,-13.619 -1.335,-14 0,-14 c 3.866,0 7,3.134 7,7 0,3.866 -3.134,7 -7,7"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M32 0H4C1.791 0 0 1.791 0 4v22h36V4c0-2.209-1.791-4-4-4z"/><path fill="#66757F" d="M10 26V7l4-4h2l4 4v19zm23-15c0-1-1-1-1-1h-7s-1 0-1 1v15h9V11z"/><path fill="#292F33" d="M28 17c0-1-1-1-1-1h-8c-1 0-1 1-1 1v9h10v-9zm-17 2H6v-5s0-1-1-1H0v13h12v-6s0-1-1-1z"/><path d="M8 21h2v2H8zm8-12h2v2h-2zm0 4h2v2h-2zm-2 4h2v2h-2zm10 1h2v2h-2zm5-6h2v2h-2zm0 4h2v2h-2z" fill="#FFCC4D"/><path fill="#E1E8ED" d="M34 20c-.344 0-.676.047-1 .113-1.677.344-3.045 1.52-3.652 3.085-.34-.567-.804-1.047-1.348-1.418-.714-.487-1.569-.78-2.5-.78-.763 0-1.47.207-2.099.542C22.773 20.611 21.707 20 20.5 20c-.986 0-1.868.415-2.5 1.073-.345.359-.619.788-.788 1.268-.528-.217-1.105-.341-1.712-.341-1.427 0-2.68.677-3.5 1.715-.19.241-.365.495-.504.771C10.892 24.185 10.221 24 9.5 24c-1.058 0-2.013.387-2.78 1-.09.072-.189.134-.274.213-.059-.074-.125-.143-.189-.213-.589-.646-1.369-1.109-2.257-1.288-.263-.053-.533-.087-.812-.087-1.284 0-2.419.591-3.188 1.501V32h36V20.422c-.613-.268-1.288-.422-2-.422z"/><path fill="#CCD6DD" d="M36 27.117c-1.223-2.039-3.449-3.408-6-3.408-2.926 0-5.429 1.796-6.475 4.344C23.35 28.034 23.18 28 23 28c-.702 0-1.369.148-1.976.409C20.291 27.554 19.215 27 18 27c-2.209 0-4 1.791-4 4 0 .05.013.097.015.146C13.689 31.06 13.353 31 13 31c-.876 0-1.679.289-2.338.767C10.065 31.294 9.32 31 8.5 31c-.198 0-.388.026-.577.059C7.286 29.279 5.602 28 3.604 28 2.136 28 .843 28.7 0 29.771V32c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-4.883z"/></svg>
\ No newline at end of file