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/1f469-1f3fb-200d-1f33e.svg b/public/emoji/1f469-1f3fb-200d-1f33e.svg
index a393ab23e..5f246340d 100644
--- a/public/emoji/1f469-1f3fb-200d-1f33e.svg
+++ b/public/emoji/1f469-1f3fb-200d-1f33e.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="clipPath76" clipPathUnits="userSpaceOnUse"><path id="path78" d="M 16,9 C 12.687,9 9,6.815 9,3.5 L 9,3.5 9,0 35,0 35,3.5 C 35,6.815 31.315,9 28,9 l 0,0 -12,0 z"/></clipPath><clipPath id="clipPath88" clipPathUnits="userSpaceOnUse"><path id="path90" 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(35,0)" id="g20"><path id="path22" style="fill:#77b255;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(18,9)" id="g24"><path id="path26" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 4,-7 0,0 Z"/></g><g transform="translate(21.9453,30.9307)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.947,-2.053 10.947,-10.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.79,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.895,-2.052 -2.288,0 -2.054,8.21 -2.054,10.948 C -10.949,-2.053 -4.105,0 0,0"/></g><g transform="translate(18.3281,8.9824)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-0.98 3.672,-0.98 0.708,0 2.194,-0.085 3.66,0.98 l 0,3.203 L 0,3.203 0,0 Z"/></g><g transform="translate(18.3223,10.8213)" id="g36"><path id="path38" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.022,-1.155 2.29,-1.468 3.668,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(13.7339,20.2822)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.564 8.211,10.564 4.534,0 8.209,-4.73 8.209,-10.564 0,-5.833 -3.675,-10.285 -8.209,-10.285 C 3.676,-10.285 0,-5.833 0,0"/></g><g transform="translate(21.9453,12.457)" id="g44"><path id="path46" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(11.7251,17)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.737,4.051 0.684,0.685 2.052,2.026 2.052,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.719,0 c 0.006,2 0.006,1.924 0.006,3.202 0,8.895 -6.842,10.729 -10.949,10.729 C 6.115,13.931 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(18.6084,18.1133)" id="g52"><path id="path54" 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.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(25.373,18.1133)" id="g56"><path id="path58" 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.847 l 0,0.844 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.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.8359,15.5)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(15.4443,20.0645)" id="g64"><path id="path66" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g68"><path id="path70" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g></g></g><g id="g72"><g clip-path="url(#clipPath76)" id="g74"><path id="path80" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,0 -3,0 0,9 3,0 0,-9 z"/><path id="path82" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,0 -3,0 0,9 3,0 0,-9 z"/></g></g><g id="g84"><g clip-path="url(#clipPath88)" id="g86"><path id="path92" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 31,1.5 13,1.5 13,0 31,0 31,1.5 Z"/><g transform="translate(7,4.25)" id="g94"><path id="path96" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.69 -0.56,1.25 -1.25,1.25 -1.94,1.25 -2.5,0.69 -2.5,0 l 0,-4.25 2.5,0 L 0,0 Z"/></g><g transform="translate(10.0029,13.25)" id="g98"><path id="path100" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.35 -1.904,-4.253 -4.253,-4.253 -2.349,0 -4.253,1.903 -4.253,4.253 0,0.086 -1.497,0.084 -1.497,0 0,-3.176 2.575,-5.75 5.75,-5.75 3.175,0 5.75,2.574 5.75,5.75 C 1.497,0.084 0,0.086 0,0"/></g><g transform="translate(1.5,13.25)" id="g102"><path id="path104" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 l 0,8.5 c 0,0.414 0.336,0.75 0.75,0.75 C -0.336,9.25 0,8.914 0,8.5 L 0,0 Z"/></g><g transform="translate(11.5,13.25)" id="g106"><path id="path108" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 l 0,8.5 c 0,0.414 0.336,0.75 0.75,0.75 C -0.336,9.25 0,8.914 0,8.5 L 0,0 Z"/></g><g transform="translate(6.5,5)" id="g110"><path id="path112" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 l 0,16.75 c 0,0.414 0.336,0.75 0.75,0.75 C -0.336,17.5 0,17.164 0,16.75 L 0,0 Z"/></g><g transform="translate(30,27.2002)" id="g114"><path id="path116" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.32 -3.092,-2.2 -8,-2.2 -4.909,0 -8,0.88 -8,2.2 0,3.546 4,8.8 5.333,8.8 1.334,0 2.223,-1.76 2.667,-1.76 0.444,0 1.333,1.76 2.667,1.76 C -4,8.8 0,3.546 0,0"/></g><g transform="translate(36,28)" id="g118"><path id="path120" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -3.5,-6 -14,-6 -10.5,0 -14,4.343 -14,6 0,1.657 6.82,1 14,1 7.18,0 14,0.657 14,-1"/></g><g transform="translate(30,27.2002)" id="g122"><path id="path124" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.32 -3.092,-2.2 -8,-2.2 -4.909,0 -8,0.88 -8,2.2 0,0.566 0.102,1.175 0.279,1.8 2.388,-2 13.054,-2 15.443,-0.005 C -0.102,1.172 0,0.564 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3E721D" d="M18 27h8l-4 7-4-7"/><path fill="#292F33" d="M21.945 5.069c4.105 0 10.947 2.053 10.947 10.947 0 8.896 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.001-8.894 6.844-10.947 10.949-10.947"/><path fill="#F7DECE" d="M18.328 27.018c1.466 1.065 2.964.98 3.672.98s2.194.085 3.66-.98v-3.203h-7.332v3.203z"/><path fill="#EEC2AD" d="M18.322 25.179c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.338v2.936z"/><path fill="#F7DECE" d="M13.734 15.718c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.729 8.209 10.563 0 5.833-3.676 10.285-8.209 10.285-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DF1F32" d="M21.945 23.543c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.535.885"/><path fill="#292F33" d="M11.725 19c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.685-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.022-.531-.04.469h.719c.006-2 .006-1.924.006-3.202 0-8.895-6.842-10.729-10.948-10.729-4.104 0-10.947 1.778-10.947 10.674 0 .793-.02 1.257.008 3.257h.719z"/><path fill="#662113" d="M18.608 17.887c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#C1694F" d="M22.836 20.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.191.423-.424.423"/><path fill="#F7DECE" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#77B255" d="M31 27.575c-.959-.372-1.996-.575-3-.575H16c-1.004 0-2.041.203-3 .575-2.207.855-4 2.614-4 4.925V36h26v-3.5c0-2.311-1.792-4.07-4-4.925z"/><path fill="#269" d="M28 27v7.5H16V27c-1.004 0-2.041.203-3 .575V36h18v-8.425c-.959-.372-1.996-.575-3-.575z"/><path fill="#C1694F" d="M7 31.75c0-.69-.56-1.25-1.25-1.25s-1.25.56-1.25 1.25V36H7v-4.25z"/><path fill="#66757F" d="M10.75 13.5c-.414 0-.75.336-.75.75v8.5l.002.01c-.005 2.088-1.516 3.813-3.502 4.168V14.25c0-.414-.336-.75-.75-.75s-.75.336-.75.75v12.677c-1.986-.355-3.497-2.079-3.502-4.168l.002-.01v-8.5c0-.414-.336-.75-.75-.75s-.75.337-.75.751v8.5c0 2.921 2.18 5.327 5 5.696V31c0 .414.336.75.75.75s.75-.336.75-.75v-2.554c2.82-.368 5-2.775 5-5.696v-8.5c0-.414-.336-.75-.75-.75z"/><path fill="#C1694F" d="M30 8.8c0 1.32-3.092 2.2-8 2.2-4.909 0-8-.88-8-2.2C14 5.253 18 0 19.333 0 20.667 0 21.556 1.76 22 1.76S23.333 0 24.667 0C26 0 30 5.253 30 8.8z"/><path fill="#C1694F" d="M36 8c0 1.657-3.5 6-14 6S8 9.657 8 8s6.82-1 14-1 14-.657 14 1z"/><path fill="#292F33" d="M30 8.8c0 1.32-3.092 2.2-8 2.2-4.909 0-8-.88-8-2.2 0-.566.102-1.175.279-1.8 2.388 2 13.054 2 15.443.004.175.623.278 1.231.278 1.796z"/></svg>
\ No newline at end of file