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/1f1f0-1f1f3.svg b/public/emoji/1f1f0-1f1f3.svg
index 86a2dd6bb..461e0f263 100644
--- a/public/emoji/1f1f0-1f1f3.svg
+++ b/public/emoji/1f1f0-1f1f3.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 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></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(0,31)" id="g20"><path id="path22" style="fill:#009e49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-19.323 26.496,0 0,0 Z"/></g><g transform="translate(36,24.8136)" id="g24"><path id="path26" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -27.233,-19.814 0,-19.814 0,0 Z"/></g><g transform="translate(29.0659,31)" id="g28"><path id="path30" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.569,0 -26.497,-19.323 0,-1.874 L 0,0 Z"/></g><g transform="translate(36,26.6875)" id="g32"><path id="path34" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -29.803,-21.687 2.57,0 L 0,-1.874 0,0 Z"/></g><g transform="translate(29.0659,31)" id="g36"><path id="path38" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -29.066,-21.197 0,-4.756 0.066,0 -0.066,-0.047 6.197,0 29.803,21.688 0,4.265 L 6.934,0 0,0 Z"/></g><g transform="translate(25.0871,19.8762)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.789,2.443 3.355,2.447 1.276,3.952 2.065,6.395 -0.009,4.882 -2.088,6.387 -1.29,3.947 -3.364,2.435 l 0,0 0,0 0,0 0,0 L -0.798,2.44 0,0 Z"/></g><g transform="translate(12.3964,13.6423)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.789,2.442 -2.074,-1.512 -2.079,1.505 0.797,-2.44 -2.073,-1.512 0,0 0,0 0,0 0,0 2.566,0.005 0.798,-2.44 0.788,2.442 2.567,0.005 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#009E49" d="M4 5C1.791 5 0 6.791 0 9v15.323L26.496 5H4z"/><path fill="#CE1126" d="M32 31c2.209 0 4-1.791 4-4V11.186L8.767 31H32z"/><path fill="#FCD116" d="M26.496 5L0 24.323v1.874L29.066 5zM8.767 31L36 11.186V9.312L6.197 31z"/><path fill="#141414" d="M32 5h-2.934L0 26.197V27c0 2.209 1.791 4 4 4h2.197L36 9.312V9c0-2.209-1.791-4-4-4z"/><path d="M27.152 9.729l-2.074 1.513-2.079-1.505.798 2.439-2.074 1.513 2.567-.005.797 2.44.789-2.443 2.567-.004-2.08-1.505zM13.185 19.915l-2.074 1.513-2.079-1.505.798 2.439-2.074 1.513 2.567-.005.797 2.44.789-2.443 2.567-.004-2.08-1.505z" fill="#FFF"/></svg>
\ No newline at end of file