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/1f1f2-1f1fe.svg b/public/emoji/1f1f2-1f1fe.svg
index 97f472e19..0480330cd 100644
--- a/public/emoji/1f1f2-1f1fe.svg
+++ b/public/emoji/1f1f2-1f1fe.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"><g transform="translate(36,9)" id="g20"><path id="path22" style="fill:#dd2e44;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 transform="translate(0.5547,7)" id="g24"><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 34.891,0 c 0.343,0.591 0.554,1.268 0.554,2 l -36,0 C -0.555,1.268 -0.343,0.591 0,0"/></g><path id="path28" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,11 -36,0 0,2 36,0 0,-2 z"/><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,15 -36,0 0,2 36,0 0,-2 z"/><path id="path32" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,19 -36,0 0,2 36,0 0,-2 z"/><path id="path34" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,23 -36,0 0,2 36,0 0,-2 z"/><g transform="translate(0.5547,29)" id="g36"><path id="path38" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.343,-0.59 -0.555,-1.268 -0.555,-2 l 36,0 c 0,0.732 -0.211,1.41 -0.554,2 L 0,0 Z"/></g><g transform="translate(18,31)" id="g40"><path id="path42" style="fill:#010066;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-10 18,0 0,14 z"/></g><g transform="translate(9.5337,18.7666)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.89,0 -5.233,2.343 -5.233,5.233 0,2.891 2.343,5.234 5.233,5.234 0.715,0 1.397,-0.146 2.018,-0.405 -0.995,0.733 -2.221,1.171 -3.552,1.171 -3.313,0 -6,-2.686 -6,-6 0,-3.313 2.687,-6 6,-6 1.331,0 2.557,0.439 3.552,1.172 C 1.397,0.145 0.715,0 0,0"/></g><g transform="translate(12.9219,27.1714)" id="g48"><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.334,-1.62 1.337,-0.305 0.935,-1.91 2.41,-1.161 1.352,-2.432 3.005,-2.396 1.5,-3.082 3.005,-3.769 1.352,-3.733 2.41,-5.004 0.935,-4.255 1.337,-5.86 0.334,-4.545 0,-6.165 l -0.334,1.62 -1.003,-1.315 0.402,1.605 -1.475,-0.749 1.058,1.271 -1.653,-0.036 1.505,0.687 -1.505,0.686 1.653,-0.036 -1.058,1.271 1.475,-0.749 -0.402,1.605 L -0.334,-1.62 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#EEE" d="M.555 29h34.891c.343-.591.554-1.268.554-2H0c0 .732.211 1.409.555 2zM0 23h36v2H0zm0-4h36v2H0zm0-4h36v2H0zm0-4h36v2H0zm.555-4C.211 7.59 0 8.268 0 9h36c0-.732-.211-1.41-.555-2H.555z"/><path fill="#010066" d="M18 5H4C1.791 5 0 6.791 0 9v10h18V5z"/><path fill="#FFCC4D" d="M9.534 17.233C6.644 17.233 4.3 14.89 4.3 12c0-2.89 2.343-5.233 5.233-5.233.715 0 1.397.146 2.018.405C10.556 6.438 9.331 6 8 6c-3.313 0-6 2.687-6 6 0 3.314 2.687 6 6 6 1.331 0 2.556-.438 3.551-1.172-.621.26-1.302.405-2.017.405z"/><path fill="#FFCC4D" d="M12.922 8.829l.334 1.62 1.003-1.315-.402 1.604 1.475-.749-1.059 1.271 1.654-.035-1.505.686 1.505.686-1.654-.035 1.059 1.271-1.475-.749.402 1.605-1.003-1.316-.334 1.621-.334-1.621-1.003 1.316.402-1.605-1.475.749 1.058-1.271-1.653.035 1.505-.686-1.505-.686 1.653.035-1.058-1.271 1.475.749-.402-1.604 1.003 1.315z"/></svg>
\ No newline at end of file