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/1f6b5-200d-2642-fe0f.svg b/public/emoji/1f6b5-200d-2642-fe0f.svg
index ec9d2b0e1..991430830 100644
--- a/public/emoji/1f6b5-200d-2642-fe0f.svg
+++ b/public/emoji/1f6b5-200d-2642-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"><path id="path20" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 36,0 0,25 c 0,0 -6.001,10 -9.001,10 -3,0 -10,-9 -12,-10.999 -2,-2 -4.5,-0.5 -5.999,1 C 7.5,26.5 6,28 5,28 4,28 0,21.001 0,21.001 L 0,0 Z"/><g transform="translate(10,31)" id="g22"><path id="path24" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,-1 0,-2 0,-3 0,-1 2,0 2,0 0,0 0.999,1 1.999,-1 1,-1.999 4.001,-1 3,1 -1,2 -4,1 -4,3 C 2.999,2 0,0 0,0"/></g><g transform="translate(14.9995,33.0005)" id="g26"><path id="path28" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 0,-4 -1,-4 -1,0 -1,1 -2,2 -1,1 3,2 3,2"/></g><g transform="translate(18.9995,20.0005)" id="g30"><path id="path32" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3,-1.999 -3,-3 0,-1.001 4,-4.001 5,-5.001 1,-1 3,-1 2,1 C 3,-5.001 0,0 0,0"/></g><g transform="translate(20.6338,12.9795)" id="g34"><path id="path36" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.173,-0.789 1.962,0.385 0.789,1.174 1.365,-1.771 1.365,-1.771 0,0 -2.559,-2.539 -4.521,-2.924 -1.963,-0.384 -1.174,0.789 -0.385,1.962 C -0.789,-1.174 0,0 0,0"/></g><g transform="translate(7.0005,2)" id="g38"><path id="path40" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 C 2.761,10 5,7.762 5,5 5,2.238 2.761,0 0,0 m 0,12 c -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 0,3.866 -3.134,7 -7,7"/></g><g transform="translate(29,2)" id="g42"><path id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 C 2.762,10 5,7.762 5,5 5,2.238 2.762,0 0,0 m 0,12 c -3.865,0 -7,-3.134 -7,-7 0,-3.866 3.135,-7 7,-7 3.867,0 7,3.134 7,7 0,3.866 -3.133,7 -7,7"/></g><g transform="translate(22,16)" id="g46"><path id="path48" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.553 -0.484,1 -1.083,1 L -11.917,1 C -12.515,1 -13,0.553 -13,0 c 0,-0.553 0.485,-1 1.083,-1 l 10.834,0 C -0.484,-1 0,-0.553 0,0"/></g><g transform="translate(30,7)" id="g50"><path id="path52" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.553 -0.447,1 -1,1 l -11,0 c -0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1 l 11,0 c 0.553,0 1,0.447 1,1"/></g><g transform="translate(21.2236,19)" id="g54"><path id="path56" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.165,-11.664 c -0.186,-0.52 0.085,-1.092 0.605,-1.277 0.111,-0.04 0.225,-0.059 0.336,-0.059 0.411,0 0.796,0.255 0.942,0.664 L 2.124,0 0,0 Z"/></g><g transform="translate(29.001,6)" id="g58"><path id="path60" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.33,0 -0.654,0.164 -0.845,0.463 l -7,10.999 c -0.297,0.467 -0.159,1.085 0.307,1.381 0.467,0.297 1.084,0.159 1.381,-0.306 l 7,-11 C 1.14,1.071 1.002,0.453 0.536,0.156 0.369,0.051 0.184,0 0,0"/></g><g transform="translate(19,10.2656)" id="g62"><path id="path64" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.387,6.524 C -8.822,6.864 -9.45,6.785 -9.79,6.349 -10.129,5.912 -10.05,5.284 -9.614,4.945 l 9,-7 c 0.182,-0.142 0.398,-0.211 0.613,-0.211 L 0,-2.266 0,0 Z"/></g><g transform="translate(6.9995,6)" id="g66"><path id="path68" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.104,0 -0.211,0.017 -0.316,0.052 -0.84,0.226 -1.124,0.792 -0.949,1.316 L 1.823,9.633 -1.6,12.201 c -0.442,0.331 -0.531,0.958 -0.2,1.4 0.331,0.44 0.957,0.531 1.4,0.199 L 4.177,10.367 0.949,0.684 C 0.809,0.265 0.419,0 0,0"/></g><g transform="translate(26.3828,17)" id="g70"><path id="path72" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0 -0.059,0.002 -0.089,0.006 l -5.672,0.708 c -0.372,0.047 -0.643,0.374 -0.62,0.748 0.024,0.374 0.333,0.664 0.707,0.665 0.041,0 4.068,0.018 5.989,1.299 C 0.565,3.594 0.898,3.583 1.14,3.4 1.379,3.215 1.477,2.899 1.381,2.612 L 0.672,0.485 C 0.575,0.192 0.302,0 0,0"/></g><g transform="translate(11,18)" id="g74"><path id="path76" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(21.999,23.0005)" id="g78"><path id="path80" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.999,-3 3,-3 L 0,0 Z"/></g><g transform="translate(19.999,19.0005)" id="g82"><path id="path84" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,-3.001 -2,-4.001 0,-1 1,-4 1,-7 0,-3 2,-3 2,-2 0,1 1.581,5.419 0,7 C 0,-5.001 3,-2 3,-2 L 0,0 Z"/></g><g transform="translate(15.6845,22.7034)" id="g86"><path id="path88" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.75,0.784 c -0.446,-1.957 -3.023,-4.486 -3.935,-4.486 -1,0 -2,0 -2,-1 0,-1 0,-1 2,-1 2,0 4,2 5,3 0.65,0.65 1.31,1.756 1.685,2.702"/></g><g transform="translate(21.999,23.0005)" id="g90"><path id="path92" style="fill:#357baa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3,-4 1,-7.001 C 1,-7.001 6,-2 6,0 6,2 3,3 3,3 L 0,0 Z"/></g><g transform="translate(20.9993,29.001)" id="g94"><path id="path96" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,1 -5.585,0.414 -7,-1 -1,-1 -1,-2 -1,-4 0,-0.176 -0.03,-0.362 -0.073,-0.55 l 2.744,-0.784 C -5.127,-5.825 -5,-5.35 -5,-5 c 0,1 1,1 2,0 1,-1 2.001,-2 3.001,-2 1,0 6,4 6,4 C 3,-2 1.897,-0.632 0,0"/></g><g transform="translate(18.9995,7)" id="g98"><path id="path100" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,-1 2,0 1,1 1,-2 1,-2 0,0 -3,-2 -5,-2 -2,0 -1,1 0,2 l 2,2 z"/></g><g transform="translate(10.9995,34.0005)" id="g102"><path id="path104" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,1 6,0 4,-2 -1,-1 -7,-2 -7,-2 0,1 1,3 3,4"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M0 36h36V11S29.999 1 26.999 1s-10 9-12 11-4.5.5-6-1C7.5 9.5 6 8 5 8s-5 7-5 7v21z"/><path fill="#FFDC5D" d="M10 5c-1 1 0 2 0 3s2 0 2 0 1-1 2 1 4 1 3-1-4-1-4-3-3 0-3 0z"/><path fill="#FFAC33" d="M15 3c0 1 0 4-1 4s-1-1-2-2 3-2 3-2z"/><path fill="#F9CA55" d="M19 16s-3 2-3 3 4 4 5 5 3 1 2-1-4-7-4-7z"/><path fill="#2A6797" d="M20.634 23.021s1.173.789 1.962-.385c.789-1.174 1.365 1.771 1.365 1.771s-2.559 2.539-4.521 2.924c-1.962.385-1.173-.789-.385-1.962l1.579-2.348z"/><path fill="#292F33" d="M7 22c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.133-7-7-7zm0 12c-2.761 0-5-2.238-5-5s2.239-5 5-5 5 2.238 5 5-2.238 5-5 5zm22-12c-3.865 0-7 3.134-7 7s3.135 7 7 7c3.867 0 7-3.134 7-7s-3.133-7-7-7zm0 12c-2.761 0-5-2.238-5-5s2.239-5 5-5c2.762 0 5 2.238 5 5s-2.238 5-5 5z"/><g fill="#E1E8ED"><path d="M22 20c0-.553-.484-1-1.083-1H10.083C9.485 19 9 19.447 9 20c0 .553.485 1 1.083 1h10.833c.6 0 1.084-.447 1.084-1zm8 9c0-.553-.447-1-1-1H18c-.552 0-1 .447-1 1 0 .553.448 1 1 1h11c.553 0 1-.447 1-1z"/><path d="M21.224 17l-4.166 11.664c-.185.519.086 1.092.606 1.277.111.04.224.059.336.059.411 0 .796-.255.942-.664L23.348 17h-2.124z"/><path d="M29.001 30c-.33 0-.654-.164-.845-.463l-7-11c-.297-.466-.159-1.084.307-1.381.467-.297 1.084-.159 1.381.307l7 11c.297.466.159 1.084-.307 1.381-.167.105-.352.156-.536.156zM19 25.734l-8.387-6.524c-.435-.34-1.063-.26-1.403.176-.339.437-.26 1.064.176 1.403l9 7c.182.143.398.211.613.211H19v-2.266z"/><path d="M7 30c-.104 0-.211-.017-.316-.052-.524-.174-.807-.74-.632-1.265l2.772-8.316-3.423-2.568c-.442-.331-.531-.958-.2-1.4.331-.44.957-.531 1.4-.2l4.577 3.433-3.228 9.684c-.141.419-.532.684-.95.684z"/></g><path fill="#292F33" d="M26.383 19c-.03 0-.059-.002-.089-.006l-5.672-.708c-.372-.046-.644-.374-.62-.748.023-.374.333-.665.707-.665.041 0 4.067-.018 5.989-1.299.25-.167.582-.157.824.026.239.185.337.501.241.788l-.709 2.127c-.096.293-.369.485-.671.485zM11 18H6c-.552 0-1-.448-1-1s.448-1 1-1h5c.552 0 1 .448 1 1s-.448 1-1 1z"/><path fill="#2A6797" d="M21.999 13L18 16l3 3z"/><path fill="#FFDC5D" d="M19.999 17s-2 3-2 4 1 4 1 7 2 3 2 2 1.581-5.419 0-7c-1-1 2-4 2-4l-3-2zm-4.314-3.703l-2.75-.784c-.447 1.956-3.023 4.486-3.935 4.486-1 0-2 0-2 1s0 1 2 1 4-2 5-3c.65-.65 1.309-1.757 1.685-2.702z"/><path fill="#357BAA" d="M21.999 13l-3 4 4 3s5-5 5-7-3-3-3-3l-3 3z"/><path fill="#4289C1" d="M20.999 6.999c-3-1-5.585-.414-7 1-1 1-1 2-1 4 0 .176-.03.362-.073.55l2.744.784c.202-.509.33-.984.33-1.334 0-1 1-1 2 0s2 2 3 2 6-4 6-4c-3.001-1-4.103-2.368-6.001-3zM19 29s1 1 2 0 1 2 1 2-3 2-5 2-1-1 0-2l2-2zM11 2c2-1 6 0 4 2-1 1-7 2-7 2 0-1 1-3 3-4z"/></svg>
\ No newline at end of file