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/1f1fa-1f1ec.svg b/public/emoji/1f1fa-1f1ec.svg
index cc3422c62..6602ca9ca 100644
--- a/public/emoji/1f1fa-1f1ec.svg
+++ b/public/emoji/1f1fa-1f1ec.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="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" 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:#d90000;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:#fcdc02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,10 -36,0 0,4 36,0 0,-4 z"/><path id="path34" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,26 -36,0 0,5 36,0 0,-5 z"/><path id="path36" style="fill:#fcdc02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,22 -36,0 0,4 36,0 0,-4 z"/><path id="path38" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,14 -36,0 0,4 36,0 0,-4 z"/></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(22,18)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(17.3438,20.9687)" id="g52"><path id="path54" style="fill:#d90000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.267,0.703 c 0,0 0.579,0.203 1.142,0 C 1.304,0.548 1.344,0 1.344,0 L 0.673,-0.203 0,0 Z"/></g><g transform="translate(17.5938,21.0781)" id="g56"><path id="path58" style="fill:#fcdc02;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0.684 c 0,0 0.111,0.044 0.423,0 C 0.734,0.641 0.875,0.422 0.875,0.422 L 0.437,-0.109 0,0 Z"/></g><g transform="translate(18.4741,16.3955)" id="g60"><path id="path62" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.229,0 0.083,0.417 C -0.146,0.417 0.146,0 0,0 m -0.729,2.708 c -0.083,0.146 0,1 0.239,1.063 0.239,0.062 0.698,0.812 0,1.062 -0.698,0.25 -0.844,-0.479 -0.844,-0.479 0,0 -0.689,-0.203 -0.603,-0.375 0.083,-0.166 0.666,0.063 0.791,-0.083 C -1.021,3.75 -1.209,3.542 -1.709,2.958 -2.209,2.375 -1.875,1.583 -1.646,1.38 -1.417,1.176 -1.146,1.021 -0.937,0.833 -0.729,0.646 -0.49,0.542 -0.49,0.542 l 0,-0.604 c 0,0 -0.697,-0.063 -1.031,-0.021 -0.334,0.042 -0.563,-0.188 -0.646,-0.458 -0.083,-0.271 0.125,-0.417 0.125,-0.209 0,0.208 0.083,0.084 0.103,-0.083 0.019,-0.167 0.168,-0.104 0.168,0.104 0,0.209 0.084,0.125 0.104,0.021 0.021,-0.104 0.167,0.042 0.188,0.167 0.021,0.125 0.208,0.187 0.375,0.229 0.167,0.041 0.614,-0.042 0.614,-0.042 l 0,-1.104 c 0,0 -0.927,-0.063 -1.01,-0.188 -0.084,-0.125 0.563,-0.104 0.563,-0.104 0,0 -0.188,-0.354 -0.105,-0.375 0.084,-0.022 0.667,0.354 0.896,0.396 0.229,0.042 0.583,-0.104 0.625,0 0.041,0.105 -0.563,0.25 -0.625,0.354 -0.063,0.103 -0.188,1.061 -0.188,1.061 0,0 0.272,0.023 0.605,0.002 0.333,-0.022 0.25,0.271 0.041,0.562 -0.208,0.291 -0.021,0.375 0.334,0.312 0.354,-0.063 0.625,0 0.625,0.563 0,0.563 -1.917,1.438 -2,1.583"/></g><g transform="translate(17.4741,20.1875)" id="g64"><path id="path66" style="fill:#d90000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.029,0.249 -0.376,0.229 -0.396,0 -0.417,-0.229 -0.042,-0.354 0,0"/></g><g transform="translate(17.75,18.9531)" id="g68"><path id="path70" style="fill:#9ca69c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.115,0.041 1.406,-0.547 1.75,-0.703 0.344,-0.156 0.303,-0.75 0.245,-1.109 -0.058,-0.36 -0.261,-0.469 -0.261,-0.469 0,0 -0.224,0.58 -0.937,0.859 C -0.161,-1.047 -0.437,-0.156 0,0"/></g><g transform="translate(19.2031,18.2656)" id="g72"><path id="path74" style="fill:#d90000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.421,-0.11 1.312,-0.312 1.391,-1.219 1.469,-2.125 0.542,-2.656 0.542,-2.656 l 0.155,0.281 -0.275,-0.094 0.12,0.203 -0.433,-0.093 c 0,0 0.725,0.578 0.472,1.093 0.02,-0.429 -0.269,-0.546 -0.269,-0.546 0,0 0.249,0.595 -0.828,1.25 0.125,0.031 0.282,0.072 0.282,0.072 L -0.516,-0.266 0.078,-0.49 -0.203,-0.141 0.359,-0.359 0,0 Z"/></g><g transform="translate(17.5938,20.6641)" id="g76"><path id="path78" style="fill:#9ca69c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.056 -0.046,-0.102 -0.102,-0.102 -0.056,0 -0.101,0.046 -0.101,0.102 0,0.056 0.045,0.101 0.101,0.101 C -0.046,0.101 0,0.056 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D90001" d="M36 27v-1H0v1c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4z"/><path fill="#FCDC02" d="M0 22h36v4H0z"/><path fill="#141414" d="M0 18h36v4H0z"/><path fill="#D90001" d="M0 14h36v4H0z"/><path fill="#FCDC02" d="M0 10h36v4H0z"/><path fill="#141414" d="M0 9v1h36V9c0-2.209-1.791-4-4-4H4C1.791 5 0 6.791 0 9z"/><circle fill="#FFF" cx="18" cy="18" r="4"/><path fill="#D90000" d="M17.344 15.031l-.267-.703s.579-.203 1.142 0c.429.155.469.703.469.703l-.671.203-.673-.203z"/><path fill="#FCDC02" d="M17.594 14.922v-.684s.111-.043.423 0 .453.262.453.262l-.438.532-.438-.11z"/><path fill="#141414" d="M17.745 16.896c-.083-.146 0-1 .239-1.062.239-.062.698-.812 0-1.062s-.844.479-.844.479-.69.203-.604.375c.083.167.667-.062.792.083s-.062.354-.562.938-.167 1.375.062 1.579.5.359.708.546.448.292.448.292v.604s-.698.062-1.031.021-.562.188-.646.458.125.417.125.209.083-.084.102.083c.019.167.168.104.168-.104s.083-.125.104-.021.167-.042.188-.167.208-.188.375-.229.614.041.614.041v1.104s-.927.062-1.01.188.562.104.562.104-.188.354-.104.375.667-.354.896-.396.583.104.625 0-.562-.25-.625-.354-.188-1.062-.188-1.062.271-.022.605-.001c.333.021.25-.271.042-.562s-.021-.375.333-.312c.354.063.625 0 .625-.563s-1.916-1.438-1.999-1.584zm.729 2.708h-.229l.083-.417c0 .001.292.417.146.417z"/><path fill="#D90000" d="M17.474 15.812c.029-.249-.375-.229-.396 0s.355.355.396 0z"/><path fill="#9CA69C" d="M17.75 17.047c.115-.041 1.406.547 1.75.703.344.156.303.75.245 1.109s-.261.469-.261.469-.225-.58-.938-.859c-.957-.375-1.234-1.266-.796-1.422z"/><path fill="#D90000" d="M19.203 17.734c.421.11 1.312.312 1.391 1.219.078.906-.849 1.438-.849 1.438l.155-.281-.275.094.12-.204-.433.094s.725-.578.472-1.094c.019.43-.269.547-.269.547s.248-.596-.828-1.25l.281-.072-.28-.225.594.225-.282-.35.562.219-.359-.36z"/><path fill="#9CA69C" d="M17.594 15.336c0 .056-.045.102-.102.102-.056 0-.102-.045-.102-.102 0-.056.045-.102.102-.102.056 0 .102.046.102.102z"/></svg>
\ No newline at end of file