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/1f5fb.svg b/public/emoji/1f5fb.svg
index 68b542bc1..a8ad074c4 100644
--- a/public/emoji/1f5fb.svg
+++ b/public/emoji/1f5fb.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,36 C 4,36 0,36 0,32 L 0,32 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,28 c 0,0 0,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 16,22 C 4,12 0,10 0,10 L 0,10 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,6 c 0,0 -5,2 -16,12 l 0,0 -4,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"><g transform="translate(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(0,10)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 4,2 16,12 l 4,0 C 31,2 36,0 36,0 l 0,-10 -36,0 0,10 z"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(15,23)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -12,-10 c 0,0 2,1 4,1 2,0 2,-3 3,-3 1,0 2,2 4,2 1.383,0 1.372,-1 3,-1 1,0 2,1 3,1 1,0 2,-1 3,-1 1,0 2,2 4,2 l 5,0 c 1,0 0,1 0,1 L 5,0 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4B545D" d="M25.208 17H11s-4.109 3.332-4.757 3.896C2.75 23.938 0 23.664 0 25.024V36h36v-9L25.208 17z"/><path fill="#292F33" d="M3.911 36c-.086-.645-.271-2.974 1.151-5.031.415-.6-.032-1.472 2.281-5 .636-.97 3.052-2.928 3.711-3.688s1.323-3.406 1.323-3.406l-1.51-.029s-.861 2.274-1.562 2.625c-1.867.935-3.802 3.122-4.167 3.75-.508.873-3.842 5.437-4.43 6.404L0 32.8V36h3.911zm27.463-14.199l-9.223-1.961 1.3 3.724 2.097 1.035c1.296.836 2.895 1.31 3.103 3.666.056.632-.39 2.882-.755 4.261-.307 1.159.057 2.079-.114 3.473h3.443c-.723-1.452-1.158-3.185-1.147-3.398.016-.309.313-3.223.48-4.858.766 1.378 2.102 3.889 2.15 4.714.037.639-.011 2.307-.056 3.542H36V24.438c0-1.247-3.155-1.289-4.626-2.637zm-15.709 7.345c-.525 1.297-.241 1.298-.306 2.099-.133 1.634.758 2.653.758 2.653s.669-1.379.655-1.929c-.067-2.494.965-3.376.833-4.048-.001-.001-1.415-.071-1.94 1.225zm-4.945 1c.301-.51 1.124-.543 1.58-1.344.456-.8.446-2.183.924-3.632s2.608-2.359 2.608-2.359-1.796-2.533-3.243-.813c-1.242 1.477-1.031 4.184-1.18 4.927-.149.743-1.832 2.934-1.832 2.934s-.361 2.382-.289 3.046c.071.666.851-1.775 1.432-2.759zm12.567-1.637c-.377-.61-1.063-1.391-1.191-2.114-.148-.836-.203-1.273-.482-1.379-.279-.106-.783.118-1.156.618-.347.465-.062 1.827-.062 1.827s.842.73 1.375 1.066c.454.286.763 3.013.852 3.332.088.319 1.041-2.74.664-3.35z"/><path fill="#E1E8ED" d="M16.063 9.906c-.762 0-5.001 5.587-5.001 5.587l-.157.256-5.312 5.719s.242.737.698 1.266c.731.847 2.059-.709 2.963-1.003 1.453-.472.976 2.182 1.915 2.289 1.272.145 2.585-2.184 3.511-2.11s1.953 2.65 2.937 2.65c1.468 0 1.309-1.947 3.32-1.947.953 0 1.141 1.117 2.514.952 1.073-.129 2.621-2.404 3.133-2.597 1.15-.433 2.6 1.446 3.452 1.356.851-.09.655-.185.655-.185L19.575 9.843h-.644c-.514 0-.736-.025-1.325-.025-.396 0-1.329.088-1.543.088z"/><path fill="#AAB8C2" d="M15.721 13.294s-1.838 3.483-2.025 4.049-.63 2.447-.63 2.447.886-.589 1.186-1.039c.3-.45.762-1.906 1.098-2.474.336-.568.953-1.166 1.186-1.596.233-.43.141-2.55.141-2.55l-.956 1.163zm-4.041 1.243c-.479.511-1.886 2.41-1.886 2.41l-4.218 4.5s.53 1.524 1.171 1.541.89-1.481.907-2.19c.017-.709 1.929-1.884 2.167-2.564s1.049-.908 1.558-1.517c.509-.609.589-1.446 1.291-2.117 1.781-1.702.808-2.142.808-2.142s-1.319 1.568-1.798 2.079zm7.515 3.947c-.103-1.114-1.099-3.592-1.099-3.592s-.402 2.154-.441 2.876.191 1.611.407 2.403c.215.792.817 1.839.817 1.839s.419-2.411.316-3.526z"/><path fill="#CCD6DD" d="M20.415 9.843h-1.396c-.19 0 .167 1.162.02 2.043-.161.964 1.821 3.066 2.239 5.307.099.53.716 3.322 1.353 4.855.598 1.44.819 1.518.819 1.518s1.971-.225 2.842-2.124c.512-1.117 4.274 2.481 5.081.36 0 0-3.166-2.326-6.169-6.466-2.755-3.8-4.288-5.493-4.789-5.493z"/><path fill="#AAB8C2" d="M22.289 16.474c.158.749.66 1.224.596 2.83-.062 1.559 3.048 2.824 2.754 3.118-1.03 1.032-2.188 1.143-2.188 1.143-.336-.179-1.314-1.872-1.536-2.832-.222-.96-.623-3.797-.892-4.379-.269-.583-.848-1.277-1.169-1.954-.321-.677-.417-1.246-.417-1.246s.962.375 1.617.936c.657.561 1.077 1.634 1.235 2.384z"/></svg>
\ No newline at end of file