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/1f468-1f3fc.svg b/public/emoji/1f468-1f3fc.svg
index 19a37a432..658aeabec 100644
--- a/public/emoji/1f468-1f3fc.svg
+++ b/public/emoji/1f468-1f3fc.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:#f3d2a2;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:#f3d2a2;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:#f3d2a2;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:#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,16)" id="g36"><path id="path38" 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(19,12)" id="g40"><path id="path42" 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(25.2744,8.9619)" id="g44"><path id="path46" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.294,0.941 c 0.003,0.034 0.02,0.063 0.02,0.097 0,0.553 -0.448,1 -1,1 l -6,0 c -0.553,0 -1,-0.447 -1,-1 0,-0.034 0.016,-0.063 0.019,-0.097 L -14.549,0 c -0.531,-0.152 -0.839,-0.706 -0.687,-1.236 0.126,-0.44 0.526,-0.726 0.961,-0.726 0.091,0 0.184,0.013 0.276,0.038 l 1.93,0.552 c -0.216,-0.293 -0.274,-0.689 -0.1,-1.037 0.175,-0.351 0.528,-0.553 0.896,-0.553 0.149,0 0.302,0.034 0.446,0.106 l 1.576,0.788 c 0.037,-0.327 0.214,-0.631 0.529,-0.788 0.144,-0.072 0.297,-0.106 0.447,-0.106 0.367,0 0.72,0.202 0.895,0.553 l 0.106,0.211 0.105,-0.211 c 0.175,-0.351 0.528,-0.553 0.896,-0.553 0.15,0 0.302,0.034 0.446,0.106 0.315,0.157 0.493,0.461 0.529,0.788 l 1.576,-0.788 c 0.144,-0.072 0.296,-0.106 0.447,-0.106 0.367,0 0.719,0.202 0.895,0.553 0.174,0.348 0.116,0.744 -0.099,1.037 l 1.93,-0.552 c 0.092,-0.025 0.184,-0.038 0.276,-0.038 0.434,0 0.835,0.286 0.96,0.726 C 0.839,-0.706 0.531,-0.152 0,0"/></g><g transform="translate(18,36.0005)" id="g48"><path id="path50" style="fill:#ffe51e;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></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" 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="#F3D2A2" 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="#662113" 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="#C1694F" 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="#FFE51E" d="M25.274 27.038l-3.294-.941c.003-.034.02-.063.02-.097 0-.553-.447-1-1-1h-6c-.552 0-1 .447-1 1 0 .034.016.063.019.097l-3.294.941c-.531.152-.838.706-.686 1.236.125.44.525.726.961.726.091 0 .184-.013.275-.038l1.931-.552c-.216.293-.274.688-.1 1.037.175.351.528.553.895.553.15 0 .303-.034.446-.105l1.577-.788c.036.326.213.631.529.788.143.071.296.105.446.105.367 0 .72-.202.896-.553l.105-.211.105.211c.176.351.529.553.896.553.15 0 .303-.034.446-.105.315-.157.493-.462.529-.788l1.576.788c.144.071.297.105.447.105.367 0 .72-.202.896-.553.174-.349.116-.744-.1-1.037l1.931.552c.091.025.183.038.275.038.434 0 .835-.286.961-.726.151-.53-.156-1.084-.688-1.236zM18 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 0z"/></svg>
\ No newline at end of file