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-1f1fc.svg b/public/emoji/1f1f2-1f1fc.svg
index 2dd553add..9b8ddf52c 100644
--- a/public/emoji/1f1f2-1f1fc.svg
+++ b/public/emoji/1f1f2-1f1fc.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:#77b255;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><path id="path24" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 0,13 0,23 36,23 36,13 Z"/><g transform="translate(32,31)" id="g26"><path id="path28" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 36,0 0,4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(23.1914,24)" id="g30"><path id="path32" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.038,1.792 -2.972,3 -5.192,3 -7.412,3 -9.345,1.792 -10.383,0 L 0,0 Z"/></g><g transform="translate(17.6982,30)" id="g34"><path id="path36" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.603,0 0.301,-2.163 0,0 Z"/></g><g transform="translate(16.1836,29.8203)" id="g38"><path id="path40" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.595,0.102 0.662,-2.081 0,0 Z"/></g><g transform="translate(14.7212,29.3872)" id="g42"><path id="path44" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.569,0.201 1.004,-1.939 0,0 Z"/></g><g transform="translate(13.353,28.7139)" id="g46"><path id="path48" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.527,0.293 1.317,-1.743 0,0 Z"/></g><g transform="translate(12.1177,27.8188)" id="g50"><path id="path52" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.471,0.378 1.592,-1.495 0,0 Z"/></g><g transform="translate(11.0513,26.7285)" id="g54"><path id="path56" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.4,0.453 1.822,-1.205 0,0 Z"/></g><g transform="translate(10.1846,25.4741)" id="g58"><path id="path60" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.318,0.513 1.999,-0.88 0,0 Z"/></g><g transform="translate(10.8975,24)" id="g62"><path id="path64" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.129,0.65 -1.356,0.091 -0.991,0 0,0 Z"/></g><g transform="translate(26.2529,24)" id="g66"><path id="path68" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.218,0.054 -0.003,0.611 -1.077,0 0,0 Z"/></g><g transform="translate(25.5225,25.9512)" id="g70"><path id="path72" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.311,-0.512 -2,-0.872 L 0,0 Z"/></g><g transform="translate(24.5791,27.1494)" id="g74"><path id="path76" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.394,-0.452 -1.432,-1.649 0,0 Z"/></g><g transform="translate(23.4473,28.1719)" id="g78"><path id="path80" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.464,-0.379 -1.133,-1.867 0,0 Z"/></g><g transform="translate(22.1592,28.9883)" id="g82"><path id="path84" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.521,-0.296 -0.802,-2.032 0,0 Z"/></g><g transform="translate(20.751,29.5757)" id="g86"><path id="path88" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.563,-0.204 -0.447,-2.138 0,0 Z"/></g><g transform="translate(19.2637,29.917)" id="g90"><path id="path92" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.591,-0.106 -0.08,-2.183 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" 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="#DD2E44" d="M0 13h36v10H0z"/><path fill="#141414" d="M32 5H4C1.791 5 0 6.791 0 9v4h36V9c0-2.209-1.791-4-4-4z"/><path d="M23.191 12C22.153 10.208 20.22 9 18 9c-2.22 0-4.153 1.208-5.191 3h10.382zm-5.493-6h.603L18 8.163zm-1.514.18l.594-.102.068 2.183zm-1.463.433l.569-.201.435 2.14zm-1.368.673l.527-.293.79 2.036zm-1.235.895l.47-.378 1.122 1.873zm-1.067 1.09l.401-.452 1.421 1.658zm-.866 1.255l.317-.513 1.681 1.393zM10.898 12l-1.13-.65-.226.559.364.091zm15.355 0l.218-.054-.221-.557-1.074.611zm-.731-1.951l.312.512-2.001.872zm-.943-1.198l.394.451-1.826 1.198zm-1.132-1.023l.464.38-1.596 1.487zm-1.288-.816l.521.296-1.323 1.735zm-1.408-.588l.564.204-1.011 1.934zm-1.487-.341l.59.106-.67 2.077z" fill="#DD2E44"/></svg>
\ No newline at end of file