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-1f1f9.svg b/public/emoji/1f1ea-1f1f9.svg
index 7e7a5194d..762cc1fb9 100644
--- a/public/emoji/1f1ea-1f1f9.svg
+++ b/public/emoji/1f1ea-1f1f9.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="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" 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:#da121a;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:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 0,13 0,23 36,23 36,13 Z"/><path id="path34" style="fill:#088930;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,23 -36,0 0,8 36,0 0,-8 z"/></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(27,18)" id="g44"><path id="path46" style="fill:#0f47af;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -4.029,-9 -9,-9 -4.971,0 -9,4.029 -9,9 0,4.971 4.029,9 9,9 4.971,0 9,-4.029 9,-9"/></g><g transform="translate(13.25,11.5312)" id="g48"><path id="path50" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.719,5.531 -2.731,1.985 1.157,0 L 3.922,4.623 3.328,4.264 2.406,5.094 0.937,0.687 0,0 Z"/></g><g transform="translate(22.6094,11.5312)" id="g52"><path id="path54" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.73,3.345 -2.723,-1.97 0.356,1.1 3.964,2.824 L -2.975,4.623 -4.102,3.863 -0.363,1.104 0,0 Z"/></g><g transform="translate(25.3818,20.3604)" id="g56"><path id="path58" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.519,-3.372 1.012,-3.223 -0.935,0.678 -1.463,4.633 0.693,-0.059 0.395,-1.272 3.7,2.647 L 0,0 Z"/></g><g transform="translate(17.8721,25.9297)" id="g60"><path id="path62" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.86,-5.486 3.344,-0.051 -0.934,-0.68 -4.548,0.038 0.271,0.642 0.979,0.06 -1.327,4.37 L 0,0 Z"/></g><g transform="translate(10.2031,20.4531)" id="g64"><path id="path66" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 5.906,0 6.969,3.254 7.327,2.156 5.809,-2.453 5.283,-1.997 5.759,-0.625 0.976,-0.654 0,0 Z"/></g><path id="path68" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.146,10.041 -0.417,0 0,3.646 0.417,0 0,-3.646 z"/><g transform="translate(25.5762,15.7754)" id="g70"><path id="path72" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.128,-0.396 -3.576,0.759 -3.448,1.154 0,0 Z"/></g><g transform="translate(22.4727,24.5469)" id="g74"><path id="path76" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.337,-0.245 -1.84,-3.266 -2.177,-3.022 0,0 Z"/></g><g transform="translate(13.1143,24.3022)" id="g78"><path id="path80" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.337,0.245 2.511,-2.776 2.175,-3.021 0,0 Z"/></g><g transform="translate(10.4766,15.3789)" id="g82"><path id="path84" style="fill:#fcdd0a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.129,0.396 3.326,1.551 3.455,1.154 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FCDD0A" d="M0 13h36v10H0z"/><path fill="#088930" d="M32 5H4C1.791 5 0 6.791 0 9v4h36V9c0-2.209-1.791-4-4-4z"/><path fill="#DA1219" d="M4 31h28c2.209 0 4-1.791 4-4v-4H0v4c0 2.209 1.791 4 4 4z"/><circle fill="#0F47AF" cx="18" cy="18" r="9"/><g fill="#FCDD0A"><path d="M13.25 24.469l1.719-5.531-2.731-1.985h1.156l3.778 2.893-.594.359-.922-.83-1.468 4.406z"/><path d="M22.609 24.469l-4.73-3.345-2.723 1.97.357-1.1 3.964-2.824.158.676-1.128.759 3.739 2.759z"/><path d="M25.382 15.64l-4.519 3.372 1.012 3.222-.935-.677-1.463-4.633.693.058.395 1.272 3.7-2.647z"/><path d="M17.872 10.07l1.86 5.487 3.344.05-.933.68-4.549-.038.271-.642.979-.06-1.327-4.37zm-7.669 5.477h5.906l1.063-3.254.358 1.098L16.012 18l-.526-.456.476-1.372-4.783.029zm7.526 6.765h.417v3.647h-.417zm7.847-2.087l-.128.396L22 19.466l.128-.396z"/><path d="M22.473 11.453l.337.245-2.177 3.021-.337-.244zm-9.359.245l.337-.245 2.174 3.021-.336.245zm-2.637 8.923l-.129-.396 3.454-1.155.129.397z"/></g></svg>
\ No newline at end of file