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/1f926-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f926-1f3fe-200d-2640-fe0f.svg
index 6ec0c9edb..8e677c492 100644
--- a/public/emoji/1f926-1f3fe-200d-2640-fe0f.svg
+++ b/public/emoji/1f926-1f3fe-200d-2640-fe0f.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(19,36)" id="g20"><path id="path22" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.721,0 -3.343,-0.406 -4.794,-1.111 -5.186,-1.042 -5.588,-1 -6,-1 c -3.866,0 -7,-3.134 -7,-7 l 0,-12 0.018,0 c 0.183,-6.467 5.471,-11.656 11.982,-11.656 6.511,0 11.799,5.189 11.982,11.656 l 0.018,0 0,9 C 11,-4.925 6.075,0 0,0"/></g><g transform="translate(27,9)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -17,0 0,-9 21,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(9,31)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-12 c 0,-3.917 2.507,-7.24 6,-8.477 L 6,-23 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 l 0,2.523 c 3.493,1.237 6,4.56 6,8.477 L 18,0 0,0 Z"/></g><g transform="translate(26.999,31)" id="g32"><path id="path34" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 -18.999,0 0,-1 0,-6 c 6,0 6,6 6,6 0,0 2,-7 14,-7 l 0,7 L 0,0 Z"/></g><path id="path36" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16.262,26.708 -4.01,0 0,4.703 4.01,0 0,-4.703 z"/><g transform="translate(18.734,17.6143)" id="g38"><path id="path40" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.827,-0.691 c 0,0 -6.529,-13.746 -7.413,-15.022 -0.884,-1.277 -1.87,-2.055 -4.57,-1.761 L 0,0 Z"/></g><path id="path42" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -1,0 0,4 1,0 0,-4 z"/><g transform="translate(14.9844,7.6094)" id="g44"><path id="path46" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.359,-4.422 -2.865,-5.335 -0.276,-0.497 -1.305,-2.009 -2.322,-2.009 0,0 2.213,-0.121 3.121,1.682 1.285,2.553 1.957,3.787 2.425,4.646 0,0 -0.125,0.329 -0.203,0.485 C 0.039,-0.297 0,0 0,0"/></g><g transform="translate(24.1566,19.6285)" id="g48"><path id="path50" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.026,0.058 -0.596,1.288 -1.747,1.529 l -0.49,-1.396 c 0.037,0.001 0.063,0.009 0.101,0.009 1.163,0 1.761,-0.422 1.774,-0.432 0.042,-0.031 0.093,-0.047 0.143,-0.047 0.053,0 0.106,0.018 0.149,0.052 C 0.015,-0.217 0.044,-0.1 0,0"/></g><g transform="translate(22.6462,27.875)" id="g52"><path id="path54" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.774,1.324 C -4.817,1.69 -5.958,1.141 -6.324,0.099 l -0.756,-2.155 -0.283,1.14 c -0.172,0.687 -0.826,1.485 -1.77,1.195 -0.678,-0.209 -0.891,-1.128 -0.72,-1.816 l 1.226,-4.929 -0.345,-0.984 0.613,-1.275 5.661,-1.986 c 0.944,-0.331 1.275,0.613 1.275,0.613 l 0.697,1.985 0.489,1.395 1.462,4.169 C 1.591,-1.507 1.042,-0.366 0,0"/></g><g transform="translate(22.0209,21.2083)" id="g56"><path id="path58" style="fill:#4f140b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.417,0 -2.107,-1.515 -2.136,-1.58 -0.044,-0.099 -0.015,-0.215 0.07,-0.283 0.083,-0.068 0.204,-0.071 0.292,-0.007 0.006,0.005 0.578,0.397 1.673,0.424 l 0.489,1.395 C 0.264,-0.025 0.138,0 0,0"/></g><g transform="translate(12.5133,28.3432)" id="g60"><path id="path62" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.687,0.171 1.383,-0.247 1.555,-0.934 l 0.284,-1.14 0.755,2.155 c 0.366,1.042 1.508,1.591 2.55,1.225 l 3.774,-1.324 c 1.042,-0.366 1.591,-1.507 1.225,-2.549 l -2.648,-7.549 c 0,0 -0.331,-0.944 -1.274,-0.613 l -5.662,1.986 -0.613,1.275 0.346,0.984 -1.227,4.929 C -1.106,-0.867 -0.687,-0.171 0,0"/></g><g transform="translate(18.744,23.9463)" id="g64"><path id="path66" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.944,-0.331 2.599,4.387 1.655,4.718 0,0 Z"/></g><g transform="translate(15.9131,24.9394)" id="g68"><path id="path70" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.944,-0.331 2.599,4.387 1.655,4.718 0,0 Z"/></g><g transform="translate(20.9948,12.6362)" id="g72"><path id="path74" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.56,1.117 -1.678,1.681 -1.924,1.167 -2.194,0.603 -2.484,0 L 0,0 Z"/></g><g transform="translate(14.9948,12.6362)" id="g76"><path id="path78" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.815,0 1.839,1.744 C 0.619,1.209 0,0 0,0"/></g><g transform="translate(18.734,17.6143)" id="g80"><path id="path82" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.9,-3.234 -1.025,-1.744 -1.159,-1.974 0.35,-2.662 c 0,-0.594 0.178,-1.144 0.476,-1.61 0.98,1.986 2.097,4.295 3.035,6.246 0.29,0.603 0.56,1.167 0.806,1.681 0.741,1.547 1.244,2.606 1.244,2.606 L 0,0 Z"/></g><g transform="translate(19.3171,14.3173)" id="g84"><path id="path86" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.377,0.191 -0.818,0.319 -1.322,0.319 -0.438,0 -0.819,-0.107 -1.161,-0.257 l -1.025,-1.743 2.701,0 C -0.516,-1.078 -0.246,-0.514 0,0"/></g><g transform="translate(14.2784,6.1499)" id="g88"><path id="path90" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1.719,-3.579 -2.106,-4.416 -2.794,-5.9 -4.278,-6.15 -4.278,-6.15 c -8,0 -3.622,8.343 -3.622,8.343 L -1.469,14.039 5.072,11.459 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#60352A" d="M19 0c-1.721 0-3.343.406-4.793 1.111C13.814 1.043 13.412 1 13 1 9.134 1 6 4.134 6 8v12h.018C6.201 26.467 11.489 31.656 18 31.656S29.799 26.467 29.982 20H30v-9c0-6.075-4.925-11-11-11z"/><path fill="#9268CA" d="M27 27H10v9h21v-5c0-2.209-1.791-4-4-4z"/><path fill="#AF7E57" d="M9 5v12c0 3.917 2.507 7.24 6 8.477V28c0 1.657 1.343 3 3 3s3-1.343 3-3v-2.523c3.493-1.237 6-4.56 6-8.477V5H9z"/><path fill="#60352A" d="M26.999 5V4H8v7c6 0 6-6 6-6s2 7 14 7V5h-1.001z"/><path fill="#60352A" d="M12.252 4.589h4.01v4.703h-4.01z"/><path fill="#7450A8" d="M18.734 18.386l1.827.691s-6.529 13.746-7.413 15.022c-.884 1.276-1.87 2.055-4.57 1.76l10.156-17.473zM26 32h1v4h-1z"/><path fill="#7450A8" d="M14.984 28.391s-2.359 4.422-2.865 5.335c-.276.497-1.305 2.009-2.322 2.009 0 0 2.214.122 3.122-1.682 1.285-2.552 1.956-3.787 2.425-4.646 0 0-.125-.328-.203-.484-.118-.235-.157-.532-.157-.532z"/><path fill="#60352A" d="M24.157 16.371c-.026-.058-.596-1.288-1.747-1.529l-.49 1.395c.037-.001.063-.009.101-.009 1.162 0 1.76.422 1.774.432.042.032.093.047.143.047.053 0 .106-.018.149-.052.085-.067.114-.184.07-.284z"/><path fill="#90603E" d="M22.646 8.125l-3.774-1.324c-1.042-.366-2.184.183-2.549 1.225l-.756 2.155-.284-1.14c-.172-.687-.825-1.486-1.77-1.195-.677.208-.891 1.127-.719 1.815l1.226 4.929-.345.984.613 1.275 5.662 1.986c.944.331 1.275-.613 1.275-.613l.696-1.985.49-1.395 1.462-4.168c.364-1.042-.185-2.183-1.227-2.549z"/><path fill="#4F140B" d="M22.021 14.792c-1.417 0-2.107 1.515-2.136 1.58-.044.099-.016.215.069.283.084.068.204.07.292.007.005-.004.578-.397 1.673-.423l.49-1.395c-.124-.027-.25-.052-.388-.052z"/><path fill="#AF7E57" d="M12.513 7.657c.687-.171 1.383.248 1.555.934l.284 1.14.756-2.155c.366-1.042 1.507-1.591 2.549-1.225l3.774 1.324c1.042.366 1.591 1.507 1.225 2.549l-2.648 7.549s-.331.944-1.275.613L13.072 16.4l-.613-1.275.345-.984-1.226-4.929c-.171-.688.248-1.385.935-1.555z"/><path fill="#90603E" d="M18.743 12.054l1.655-4.718.944.331-1.655 4.718zm-2.83-.993l1.656-4.718.943.331-1.655 4.718z"/><path fill="#DF1F32" d="M20.995 23.364s-.56-1.117-1.678-1.681c-.246.514-.516 1.078-.807 1.681h2.485zm-6 0h.815l1.024-1.744c-1.22.535-1.839 1.744-1.839 1.744z"/><path fill="#90603E" d="M18.734 18.386l-1.9 3.234-1.024 1.744-1.16 1.974L15 28c0 .594.178 1.144.476 1.61.98-1.986 2.097-4.295 3.035-6.246l.807-1.681c.741-1.547 1.244-2.606 1.244-2.606l-1.828-.691z"/><path fill="#A0041E" d="M19.317 21.683c-.377-.191-.818-.319-1.322-.319-.438 0-.819.107-1.161.256l-1.024 1.744h2.701l.806-1.681z"/><path fill="#9268CA" d="M14.278 29.85s-1.719 3.579-2.107 4.416C11.484 35.75 10 36 10 36c-8 0-3.622-8.343-3.622-8.343l6.432-11.846 6.541 2.58-5.073 11.459z"/></svg>
\ No newline at end of file