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/1f934-1f3fb.svg b/public/emoji/1f934-1f3fb.svg
index 841a50ec3..f8768989f 100644
--- a/public/emoji/1f934-1f3fb.svg
+++ b/public/emoji/1f934-1f3fb.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(32,16)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.21 -1.119,4.001 -2.5,4.001 -0.012,0 -0.021,-0.005 -0.033,-0.006 -1.512,6.301 -6.073,10.88 -11.467,10.88 -5.394,0 -9.956,-4.579 -11.467,-10.88 -0.012,10e-4 -0.022,0.006 -0.033,0.006 -1.381,0 -2.5,-1.791 -2.5,-4.001 0,-2.107 1.021,-3.815 2.314,-3.97 1.223,-6.649 5.985,-11.03 11.686,-11.03 5.7,0 10.463,4.381 11.686,11.03 C -1.021,-3.815 0,-2.107 0,0"/></g><g transform="translate(13,15)" id="g24"><path id="path26" style="fill:#662113;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,15)" id="g28"><path id="path30" style="fill:#662113;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(18,5)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.201,0 -5.491,1.077 -5.707,1.293 -0.391,0.391 -0.391,1.023 0,1.414 0.378,0.379 0.984,0.39 1.376,0.036 C -4.251,2.686 -3.231,2 0,2 3.355,2 4.326,2.739 4.336,2.747 4.726,3.136 5.337,3.117 5.729,2.727 6.119,2.336 6.098,1.684 5.707,1.293 5.491,1.077 4.201,0 0,0"/></g><g transform="translate(19,10)" id="g36"><path id="path38" style="fill:#c1694f;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,35.0005)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 8,0 13,-6 13,-11 0,-5 -1,-7 -2,-5 l -2,4 c 0,0 -6,0 -8,2 0,0 3,-6 -3,0 0,0 1,-4 -5,1 0,0 -3,-2 -4,-7 -0.277,-1.387 -2,0 -2,5 0,5 4,11 13,11"/></g><g transform="translate(28.5498,27.6001)" id="g44"><path id="path46" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.675,5.4 -5.104,1.21 -10.581,7.9 -16.074,1.21 -18.558,5.4 -21.604,0 l -1.446,2.15 0,-3.25 25,0 0,3.25 L 0,0 Z"/></g><g transform="translate(28.5498,27.6001)" id="g48"><path id="path50" style="fill:none;stroke:#99aab5;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 -2.675,5.4 -5.104,1.21 -10.581,7.9 -16.074,1.21 -18.558,5.4 -21.604,0 l -1.446,2.15 0,-3.25 25,0 0,3.25 L 0,0 Z"/></g><g transform="translate(18,33)" id="g52"><path id="path54" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,-2 0,-2 2,-2 2,2 0,2 -2,2 z"/></g><g transform="translate(11,29.9995)" id="g56"><path id="path58" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-1.414 -2,0 -1,1.414 0,0 Z"/></g><g transform="translate(27,29.9995)" id="g60"><path id="path62" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-1.414 -2,0 -1,1.414 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M32 20c0-2.209-1.119-4-2.5-4-.012 0-.021.005-.033.005C27.955 9.704 23.394 5.125 18 5.125s-9.956 4.58-11.467 10.88C6.521 16.004 6.511 16 6.5 16 5.119 16 4 17.791 4 20c0 2.107 1.021 3.815 2.314 3.97C7.537 30.619 12.299 35 18 35c5.7 0 10.463-4.381 11.685-11.03C30.979 23.815 32 22.107 32 20z"/><path d="M13 21c-.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" fill="#662113"/><path d="M18 31c-4.201 0-5.491-1.077-5.707-1.293-.391-.391-.391-1.023 0-1.414.378-.379.984-.39 1.376-.036.08.058 1.1.743 4.331.743 3.355 0 4.326-.739 4.336-.747.39-.389 1.001-.37 1.393.021.391.391.369 1.043-.021 1.434C23.491 29.923 22.201 31 18 31zm1-5h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#C1694F"/><path fill="#292F33" d="M18 1c8 0 13 6 13 11s-1 7-2 5l-2-4s-6 0-8-2c0 0 3 6-3 0 0 0 1 4-5-1 0 0-3 2-4 7-.277 1.387-2 0-2-5S9 1 18 1z"/><g fill="#99AAB5"><path d="M28.55 8.4L25.875 3l-2.429 4.189L17.969.5l-5.493 6.689L9.992 3 6.946 8.4 5.5 6.25V9.5h25V6.25z"/><path d="M30.5 10h-25c-.276 0-.5-.224-.5-.5V6.25c0-.22.144-.414.354-.478.21-.067.438.017.561.199l.994 1.478 2.648-4.694c.088-.156.251-.253.43-.255.195.019.344.092.436.245l2.12 3.576L17.584.183c.093-.116.235-.183.385-.183.149 0 .292.067.386.183l5.021 6.131 2.066-3.565c.093-.16.254-.262.449-.249.184.006.35.112.432.277l2.349 4.743 1.458-1.606c.139-.153.357-.206.55-.13.193.074.32.259.32.466V9.5c0 .276-.224.5-.5.5zM6 9h24V7.545l-1.08 1.19c-.11.123-.27.186-.439.159-.163-.023-.306-.125-.379-.273l-2.261-4.565-1.962 3.384c-.082.142-.229.234-.393.248-.165.012-.322-.055-.426-.182l-5.091-6.218-5.106 6.218c-.103.126-.264.193-.424.181-.163-.012-.309-.104-.392-.244l-2.042-3.446-2.623 4.649c-.086.15-.243.247-.416.253-.175.013-.337-.077-.435-.22L6 7.889V9z"/></g><path fill="#E1E8ED" d="M18 3l-2 2v2l2 2 2-2V5zm-7 3l-1 1.415L9 6l1-1.414zm16 0l-1 1.415L25 6l1-1.414z"/></svg>
\ No newline at end of file