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/1f9d4-1f3fe.svg b/public/emoji/1f9d4-1f3fe.svg
index 9f6dbcad7..3a1941d26 100644
--- a/public/emoji/1f9d4-1f3fe.svg
+++ b/public/emoji/1f9d4-1f3fe.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(8,17)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.209 -1.119,-4 -2.5,-4 -3.881,-4 -5,-2.209 -5,0 -5,2.21 -3.881,4.001 -2.5,4.001 -1.119,4.001 0,2.21 0,0"/></g><g transform="translate(33,17)" id="g24"><path id="path26" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.209 -1.119,-4 -2.5,-4 -3.881,-4 -5,-2.209 -5,0 -5,2.21 -3.881,4.001 -2.5,4.001 -1.119,4.001 0,2.21 0,0"/></g><g transform="translate(5,15.4375)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,8.526 5.82,15.438 13,15.438 20.18,15.438 26,8.526 26,0 26,-8.525 20.18,-15.438 13,-15.438 5.82,-15.438 0,-8.525 0,0"/></g><g transform="translate(13,16)" id="g32"><path id="path34" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.552,4 0,4 0.552,4 1,3.552 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(23,16)" id="g36"><path id="path38" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.552 -0.553,4 0,4 0.553,4 1,3.552 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(19,12)" id="g40"><path id="path42" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(18,36.0005)" id="g44"><path id="path46" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 8.615,0 14,-6.358 14,-11.656 0,-5.298 -1.077,-7.418 -2.154,-5.298 -1.076,2.119 -2.154,4.238 -2.154,4.238 0,0 -6.462,0 -8.615,2.12 0,0 3.231,-6.358 -3.231,0 0,0 1.077,-4.239 -5.385,1.059 0,0 -3.23,-2.119 -4.307,-7.417 -0.299,-1.47 -2.154,0 -2.154,5.298 C -14,-6.358 -9.692,0 0,0"/></g><g transform="translate(18,6.3253)" id="g48"><path id="path50" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.167,0 -7.292,2.2 0,2.2 7.292,2.2 4.167,0 0,0 M 9.375,5.5 C 8.333,4.4 6.25,2.2 4.167,3.3 1.221,4.856 0,4.4 0,4.4 0,4.4 -1.221,4.856 -4.167,3.3 -6.25,2.2 -8.333,4.4 -9.375,5.5 c -0.737,0.778 -3.125,2.2 -3.125,0 0,-3.3 2.083,-5.5 2.083,-5.5 2.084,-5.5 6.25,-5.5 6.25,-5.5 1.042,-1.1 7.292,-1.1 8.334,0 0,0 4.166,0 6.25,5.5 0,0 2.083,2.2 2.083,5.5 0,2.2 -2.389,0.778 -3.125,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M8 19c0 2.209-1.119 4-2.5 4S3 21.209 3 19s1.119-4 2.5-4S8 16.791 8 19zm25 0c0 2.209-1.119 4-2.5 4S28 21.209 28 19s1.119-4 2.5-4 2.5 1.791 2.5 4z"/><path fill="#AF7E57" d="M5 20.562c0-8.526 5.82-15.438 13-15.438s13 6.912 13 15.438S25.18 36 18 36 5 29.088 5 20.562z"/><path fill="#60352A" d="M13 20c-.552 0-1-.447-1-1v-2c0-.552.448-1 1-1s1 .448 1 1v2c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2c0 .553-.447 1-1 1z"/><path fill="#915A34" d="M19 24h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#60352A" d="M18 0c8.615 0 14 6.358 14 11.656 0 5.298-1.077 7.417-2.154 5.298l-2.153-4.238s-6.462 0-8.615-2.12c0 0 3.23 6.358-3.231 0 0 0 1.077 4.239-5.385-1.06 0 0-3.23 2.12-4.308 7.417C5.855 18.423 4 16.954 4 11.656 4 6.357 8.308 0 18 0zm9.375 24.174c-1.042 1.1-3.125 3.3-5.208 2.2-2.946-1.556-4.167-1.1-4.167-1.1s-1.221-.455-4.167 1.1c-2.083 1.1-4.167-1.1-5.208-2.2-.737-.778-3.125-2.2-3.125 0 0 3.3 2.083 5.5 2.083 5.5 2.083 5.5 6.25 5.5 6.25 5.5 1.042 1.1 7.292 1.1 8.333 0 0 0 4.167 0 6.25-5.5 0 0 2.083-2.2 2.083-5.5.001-2.2-2.388-.777-3.124 0zM18 29.675c-4.167 0-7.292-2.2 0-2.2s4.167 2.2 0 2.2z"/></svg>
\ No newline at end of file