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/1f1ee-1f1f3.svg b/public/emoji/1f1ee-1f1f3.svg
index c8720d0ea..7af1dafe4 100644
--- a/public/emoji/1f1ee-1f1f3.svg
+++ b/public/emoji/1f1ee-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 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath42" clipPathUnits="userSpaceOnUse"><path id="path44" d="m 15,21 6,0 0,-6 -6,0 0,6 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,9)" id="g20"><path id="path22" style="fill:#138808;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 36,4 0,4 0,0 Z"/></g><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,13 36,13 36,23 0,23 0,13 Z"/><g transform="translate(36,23)" id="g26"><path id="path28" style="fill:#ff9933;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4 c 0,2.209 -1.791,4 -4,4 l -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 36,0 z"/></g><g transform="translate(22,18)" id="g30"><path id="path32" style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.21 -1.791,4.001 -4.001,4.001 -2.209,0 -4,-1.791 -4,-4.001 0,-2.209 1.791,-4 4,-4 C -1.791,-4 0,-2.209 0,0"/></g><g transform="translate(21,18)" id="g34"><path id="path36" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.344,3.001 -3.001,3.001 -1.657,0 -3,-1.344 -3,-3.001 0,-1.657 1.343,-3 3,-3 C -1.344,-3 0,-1.657 0,0"/></g><g id="g38"><g id="g40"/><g id="g46"><g style="opacity:0.60000598" id="g48" clip-path="url(#clipPath42)"><g id="g50" transform="translate(18,21)"><path id="path52" style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.146,-2.264 1.148,-0.229 0.417,-2.376 2.121,-0.878 0.624,-2.583 2.771,-1.852 0.736,-2.854 3,-3 0.736,-3.146 2.771,-4.147 0.624,-3.417 2.121,-5.121 0.417,-3.624 1.148,-5.771 0.146,-3.736 0,-6 l -0.146,2.264 -1.002,-2.035 0.731,2.147 -1.705,-1.497 1.498,1.704 -2.147,-0.73 2.035,1.001 L -3,-3 l 2.264,0.146 -2.035,1.002 2.147,-0.731 -1.498,1.705 1.705,-1.498 -0.731,2.147 1.002,-2.035 L 0,0 Z"/></g></g></g></g><g transform="translate(17,18)" id="g54"><path id="path56" style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.448,1 1,1 1.552,1 2,0.552 2,0 2,-0.552 1.552,-1 1,-1 0.448,-1 0,-0.552 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#138808" d="M0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-4H0v4z"/><path fill="#EEE" d="M0 13h36v10H0z"/><path fill="#F93" d="M36 13V9c0-2.209-1.791-4-4-4H4C1.791 5 0 6.791 0 9v4h36z"/><circle fill="navy" cx="18" cy="18" r="4"/><circle fill="#EEE" cx="18" cy="18" r="3"/><path fill="#6666B3" d="M18 15l.146 2.264 1.001-2.035-.73 2.147 1.704-1.498-1.497 1.705 2.147-.731-2.035 1.002L21 18l-2.264.146 2.035 1.001-2.147-.73 1.497 1.704-1.704-1.497.73 2.147-1.001-2.035L18 21l-.146-2.264-1.002 2.035.731-2.147-1.705 1.497 1.498-1.704-2.147.73 2.035-1.001L15 18l2.264-.146-2.035-1.002 2.147.731-1.498-1.705 1.705 1.498-.731-2.147 1.002 2.035z"/><circle fill="navy" cx="18" cy="18" r="1"/></svg>
\ No newline at end of file