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/1f1ea-1f1f7.svg b/public/emoji/1f1ea-1f1f7.svg
index 067278b02..8e1e510fe 100644
--- a/public/emoji/1f1ea-1f1f7.svg
+++ b/public/emoji/1f1ea-1f1f7.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,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath42" clipPathUnits="userSpaceOnUse"><path id="path44" 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(36,9)" id="g20"><path id="path22" style="fill:#4289de;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><path id="path32" style="fill:#3e9a00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,18 0,18 0,31 36,31 36,18 Z"/><g transform="translate(0,30)" id="g34"><path id="path36" style="fill:#eb0438;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 36,-12 0,-24 0,0 Z"/></g></g></g><g id="g38"><g clip-path="url(#clipPath42)" id="g40"><g transform="translate(11.6875,11.6875)" id="g46"><path id="path48" style="fill:#ffc827;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.457,-0.187 -2,-0.312 -2.375,0 -0.375,0.312 0.75,1 0.75,1 0,0 -1.125,-0.063 -2.469,0.406 -1.343,0.469 -1.968,1.313 -2.593,1.313 0.406,0.406 1.781,-0.281 1.781,-0.281 0,0 -2.469,1.156 -2.594,2.843 0.781,-1.094 1.656,-1.343 1.656,-1.343 0,0 -1.968,1.406 -1.312,3.468 0.156,-0.531 0.562,-1.094 0.562,-1.094 0,0 -0.75,2.313 0.094,3.626 0.281,-0.25 0.375,-1.844 0.375,-1.844 0,0 -0.125,1.531 0.094,2.375 0.219,0.844 0.875,1.156 0.875,1.156 l -0.281,-1.562 c 0,0 0.562,0.437 0.781,0.812 0.219,0.375 1.25,1.75 2,1.844 0.093,-0.219 -0.594,-0.875 -0.594,-0.875 0,0 1.844,0.937 2.688,0.531 -0.5,-0.469 -2.063,-0.656 -2.063,-0.656 0,0 0.813,-0.375 1.188,-0.094 -0.094,-0.281 -0.719,-0.5 -1.157,-0.406 -0.437,0.094 -0.844,-0.281 -0.844,-0.281 0,0 0.629,-0.266 0.907,0 -0.188,-0.594 -1.125,-0.469 -1.438,-0.469 -0.312,0 -1.437,-0.75 -1.437,-1.281 0.5,0.156 0.875,0.781 0.875,0.781 0,0 0.344,-0.906 -0.563,-1.313 C -6,8.25 -5.937,7.469 -5.937,7.469 c 0,0 0.501,0.184 0.562,0.625 0.531,-0.25 -0.156,-0.688 -0.312,-0.938 -0.157,-0.25 -0.188,-1.375 -0.188,-1.375 0,0 0.281,0.969 0.344,1.094 C -5.469,7 -5,6 -5.187,5.562 -5.375,5.125 -5.562,4.219 -5.281,3.719 c 0.187,0.125 0.062,1.093 0.062,1.093 0,0 0.657,-0.593 0.688,-1.187 C -4.344,3.469 -4.344,4 -4.344,4 c 0,0 0.438,-0.906 0.594,-1.406 0.156,-0.5 1.062,-0.938 1.5,-0.907 0.438,0.032 0.969,-0.281 0.969,-0.281 0,0 -0.188,1.094 -0.188,1.563 0,0.469 0.063,0.969 0.063,0.969 0,0 -1.875,-0.907 -1.938,0.843 0.469,-0.531 1.063,-0.344 1.063,-0.344 0,0 -1.157,0.219 -1.094,1.25 0.375,-0.468 0.937,-0.468 0.937,-0.468 0,0 -0.625,0.402 -0.468,1.029 0.718,-0.123 1.125,-1.217 1.125,-1.217 0,0 0.062,0.903 0.031,1.217 -0.031,0.314 -0.062,0.908 -0.062,0.908 0,0 -1.157,-0.5 -1.344,1.032 0.312,-0.407 0.656,-0.251 0.656,-0.251 0,0 -0.656,0.501 -0.375,1.438 C -2.656,8.75 -2.156,8.5 -2.156,8.5 c 0,0 -0.219,0.5 -0.219,0.781 0.438,0 0.906,-0.437 0.813,-1.406 0.593,0.594 0.5,1.406 0.375,1.656 -0.532,-0.187 -1.001,0.5 -1.001,0.5 0,0 0.657,-0.25 0.782,0.219 -0.782,-0.219 -0.969,0.406 -0.969,0.406 0,0 0.688,0.25 1.031,0 0.25,0.188 0.094,0.594 0.094,0.594 0,0 0.969,-0.344 0.313,-1.187 0.125,-0.407 0.125,-1.032 0.125,-1.032 0,0 0.312,0.969 1.093,1.032 C -0.187,9.625 0,9.219 0,9.219 c 0,0 0.562,0.094 0.625,0.437 0.719,-0.593 -0.687,-1.312 -0.687,-1.312 0,0 0.406,-0.156 0.749,0.281 C 1.125,7.906 0,7.719 -0.437,7.875 -0.875,8.031 -1.125,8.063 -1.219,7.781 -1.312,7.5 -1.437,6.219 -1.406,6.312 c 0.031,0.094 0.252,0.93 0.5,1.282 -0.031,-0.469 0.125,-0.907 0.125,-0.907 0,0 1,-0.031 0.75,0.907 0.968,0.062 -0.188,-1.346 -0.188,-1.346 0,0 0.472,-0.377 1.049,0 0.201,-0.873 -0.768,-0.686 -1.111,-0.686 -0.344,0 -1.188,0.063 -1.063,-0.531 0.125,-0.594 0.438,-1.718 0.438,-1.718 0,0 0.094,0.687 0.375,1.187 0.281,0.5 0.656,0.656 0.5,-0.125 0.406,0.062 0.718,0.75 0.718,0.75 0,0 0.469,-0.844 -0.531,-1.437 0.219,-0.219 0.701,0.374 0.701,0.374 0,0 0.112,-0.874 -0.638,-1.124 -0.75,-0.25 -1.031,-0.094 -1.094,-0.563 -0.062,-0.469 0,-0.844 0,-0.844 0,0 0.375,-0.062 0.969,0.313 0.593,0.375 1.062,0.031 1.437,0.437 0.375,0.407 0.438,1.532 1.063,1.938 0.031,-0.406 0,-0.813 0,-0.813 0,0 0.469,0.313 0.469,0.781 0,0.469 0.093,0.719 0.25,0.907 0.156,0.187 -0.188,0.621 -0.219,1.154 -0.031,0.533 0.259,0.783 0.259,0.783 0,0 0.178,-1.187 0.585,-1.594 0.312,1 -0.25,1.469 -0.375,2.032 -0.125,0.562 0.218,0.594 -0.375,1 -0.594,0.406 -0.938,1 -0.719,1.656 0.406,-0.906 0.937,-0.969 0.937,-0.969 0,0 -0.562,1.407 -0.875,1.313 C 2.219,10.375 1.437,10 0.875,10.563 c 0.781,-0.032 0.906,0.125 0.906,0.125 0,0 -0.187,0.593 -0.906,0.375 -0.719,-0.219 -1.625,0.186 -1.906,0.562 0.531,-0.156 0.687,-0.062 0.687,-0.062 l -0.531,0.343 c 0,0 0.438,-0.093 0.75,0 0.312,0.094 0.406,0.313 0.812,-0.031 0.407,-0.344 1,-0.687 1,-0.687 0,0 -1.031,0.687 -0.968,1.531 C 2,12.344 2.344,11.188 2.656,11 2.969,10.813 3.469,10.313 3.625,9.813 c 0.156,0.593 -0.469,1.625 -0.469,1.625 0,0 1.094,-0.094 1.156,-2.782 0.282,0.188 0,1.532 0,1.532 0,0 1,-0.5 0.75,-1.907 C 4.812,6.875 4.406,6.248 4.406,6.248 c 0,0 0.612,0.283 0.697,0.971 C 5.812,6.531 5.25,5.406 4.094,3.938 c 1.323,0.624 1.323,1.656 1.323,1.656 0,0 0.27,-1.375 -0.886,-2.188 C 3.375,2.594 2.844,2.469 2.844,2.469 2.844,2.469 3.625,2.406 4,2.313 3.813,1.25 0.156,1.094 -0.531,1 0.312,0.5 0.278,0.114 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3E9A00" d="M32 5H4c-1.185 0-2.238.525-2.97 1.343V18H36V9c0-2.209-1.791-4-4-4z"/><path fill="#4289DE" d="M32 31H4c-1.185 0-2.238-.525-2.97-1.343V18H36v9c0 2.209-1.791 4-4 4z"/><path fill="#EB0438" d="M1.03 6.343C.397 7.051 0 7.976 0 9v18c0 1.024.397 1.949 1.03 2.657L36 18 1.03 6.343z"/><path fill="#FFC827" d="M11.688 24.312c-.457.188-2 .312-2.375 0s.75-1 .75-1-1.125.062-2.469-.406C6.25 22.438 5.625 21.594 5 21.594c.406-.406 1.781.281 1.781.281s-2.469-1.156-2.594-2.844c.781 1.094 1.656 1.344 1.656 1.344s-1.969-1.406-1.312-3.469c.157.532.563 1.094.563 1.094s-.75-2.312.094-3.625c.281.25.375 1.844.375 1.844s-.125-1.531.094-2.375c.218-.844.874-1.156.874-1.156L6.25 14.25s.562-.438.781-.812 1.25-1.75 2-1.844c.094.219-.594.875-.594.875s1.844-.938 2.688-.531c-.5.469-2.062.656-2.062.656s.812.375 1.188.094c-.094.281-.719.5-1.156.406-.439-.094-.845.281-.845.281s.629.265.906 0c-.188.594-1.125.469-1.438.469s-1.438.75-1.438 1.281c.5-.156.875-.781.875-.781s.345.906-.561 1.312-.844 1.188-.844 1.188.502-.184.562-.625c.531.25-.156.688-.312.938s-.188 1.375-.188 1.375.281-.969.344-1.094.532.874.344 1.312-.375 1.344-.094 1.844c.188-.125.063-1.094.063-1.094s.656.594.688 1.188c.188.156.188-.375.188-.375s.438.906.594 1.406 1.062.938 1.5.906c.438-.031.969.281.969.281s-.188-1.094-.188-1.562c0-.469.062-.969.062-.969s-1.875.906-1.938-.844c.469.531 1.062.344 1.062.344s-1.156-.219-1.094-1.25c.375.469.938.469.938.469s-.625-.402-.469-1.029c.719.123 1.125 1.217 1.125 1.217s.062-.902.031-1.217c-.031-.315-.062-.908-.062-.908s-1.156.5-1.344-1.031c.312.406.656.25.656.25s-.656-.5-.375-1.438c.219.625.719.875.719.875s-.219-.5-.219-.781c.438 0 .906.438.812 1.406.594-.594.5-1.406.375-1.656-.531.188-1-.5-1-.5s.656.25.781-.219c-.781.219-.969-.406-.969-.406s.688-.25 1.031 0c.25-.188.094-.594.094-.594s.969.344.312 1.188c.125.406.125 1.031.125 1.031s.312-.969 1.094-1.031c-.469.438-.281.844-.281.844s.564-.095.626-.439c.719.594-.688 1.312-.688 1.312s.406.156.75-.281c.438.719-.688.906-1.125.75-.438-.156-.688-.188-.781.094-.094.281-.219 1.562-.188 1.469.031-.094.252-.93.5-1.281-.031.469.125.906.125.906s1 .031.75-.906c.969-.062-.188 1.346-.188 1.346s.472.377 1.048 0c.202.873-.767.685-1.111.685s-1.188-.062-1.062.531c.127.594.439 1.719.439 1.719s.094-.688.375-1.188.656-.656.5.125c.406-.062.719-.75.719-.75s.469.844-.531 1.438c.219.219.701-.375.701-.375s.112.875-.638 1.125-1.031.094-1.094.562c-.062.469 0 .844 0 .844s.375.062.969-.312c.594-.375 1.062-.031 1.438-.438.375-.406.438-1.531 1.062-1.938.031.406 0 .812 0 .812s.469-.312.469-.781c0-.469.094-.719.25-.906.156-.188-.188-.621-.219-1.154-.031-.533.259-.783.259-.783s.178 1.188.585 1.594c.312-1-.25-1.469-.375-2.031s.219-.594-.375-1-.938-1-.719-1.656c.406.906.938.969.938.969s-.562-1.406-.875-1.312c-.312.094-1.094.469-1.656-.094.781.031.906-.125.906-.125s-.188-.594-.906-.375c-.719.219-1.625-.187-1.906-.562.531.156.688.062.688.062l-.531-.344s.438.094.75 0 .406-.312.812.031c.406.344 1 .688 1 .688s-1.031-.688-.969-1.531c1.281.375 1.625 1.531 1.938 1.719s.81.686.966 1.186c.156-.594-.469-1.625-.469-1.625s1.094.094 1.156 2.781c.281-.188 0-1.531 0-1.531s1 .5.75 1.906-.656 2.033-.656 2.033.611-.283.696-.971c.71.688.147 1.812-1.009 3.281 1.323-.625 1.323-1.656 1.323-1.656s.271 1.375-.885 2.188c-1.156.812-1.688.938-1.688.938s.781.062 1.156.156c-.188 1.062-3.844 1.219-4.531 1.312.845.5.811.886.533 1z"/></svg>
\ No newline at end of file