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/1f4b9.svg b/public/emoji/1f4b9.svg
index eff7d7351..f6143a066 100644
--- a/public/emoji/1f4b9.svg
+++ b/public/emoji/1f4b9.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.042,4)" 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,28 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><g transform="translate(9.8965,21.125)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.105,0 c -0.687,0 -1.226,0.327 -1.226,0.985 0,0.661 0.539,0.991 1.226,0.991 l 2.876,0 -4.792,7.398 c -0.297,0.449 -0.449,0.776 -0.449,1.195 0,0.571 0.571,0.991 1.049,0.991 0.481,0 0.958,-0.21 1.378,-0.839 l 5.36,-8.058 5.363,8.058 c 0.419,0.629 0.897,0.839 1.378,0.839 0.477,0 1.046,-0.42 1.046,-0.991 0,-0.419 -0.149,-0.746 -0.449,-1.195 l -4.792,-7.398 2.875,0 c 0.69,0 1.229,-0.33 1.229,-0.991 C 7.967,0.327 7.428,0 6.738,0 l -4.101,0 0,-2.126 4.101,0 c 0.69,0 1.229,-0.332 1.229,-0.99 0,-0.658 -0.539,-0.988 -1.229,-0.988 l -4.101,0 0,-4.611 c 0,-0.868 -0.539,-1.41 -1.32,-1.41 -0.778,0 -1.317,0.542 -1.317,1.41 l 0,4.611 -4.105,0 c -0.687,0 -1.226,0.33 -1.226,0.988 0,0.658 0.539,0.99 1.226,0.99 L 0,-2.126 0,0 Z"/></g><g transform="translate(4.002,2)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.68,0 -1.342,0.346 -1.717,0.971 -0.568,0.947 -0.261,2.175 0.686,2.744 l 5,3 c 0.501,0.3 1.109,0.366 1.661,0.182 l 4.678,-1.559 3.129,3.911 c 0.549,0.689 1.483,0.933 2.304,0.608 l 3.03,-1.212 2.33,6.987 c 0.098,0.295 0.263,0.563 0.483,0.782 l 5,5 c 0.781,0.781 2.047,0.781 2.828,0 0.781,-0.781 0.781,-2.047 0,-2.828 L 24.746,13.92 21.896,5.367 C 21.722,4.845 21.339,4.417 20.84,4.186 20.341,3.955 19.768,3.939 19.255,4.143 L 15.633,5.592 12.56,1.751 C 12.036,1.097 11.16,0.839 10.366,1.103 L 5.238,2.812 1.027,0.285 C 0.705,0.092 0.35,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M36.042 32c0 2.209-1.791 4-4 4h-28c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M9.896 14.875H5.792c-.688 0-1.227-.327-1.227-.985 0-.661.539-.99 1.227-.99h2.876L3.876 5.501c-.298-.449-.449-.776-.449-1.195 0-.571.57-.99 1.049-.99.48 0 .958.21 1.378.839l5.36 8.058 5.362-8.058c.419-.629.897-.839 1.378-.839.478 0 1.046.42 1.046.99 0 .419-.148.746-.448 1.195L13.76 12.9h2.875c.689 0 1.229.329 1.229.99 0 .658-.539.985-1.229.985h-4.102v2.126h4.102c.689 0 1.229.332 1.229.99 0 .658-.539.987-1.229.987h-4.102v4.611c0 .868-.539 1.41-1.319 1.41-.778 0-1.317-.542-1.317-1.41v-4.611H5.792c-.688 0-1.227-.329-1.227-.987 0-.658.539-.99 1.227-.99h4.105v-2.126z"/><path fill="#FFF" d="M4.002 34c-.68 0-1.342-.346-1.717-.971-.568-.947-.261-2.176.686-2.744l5-3c.501-.3 1.108-.366 1.661-.183l4.677 1.56 3.129-3.911c.55-.688 1.483-.933 2.305-.608l3.03 1.213 2.329-6.988c.099-.295.264-.562.483-.782l5-5c.781-.781 2.047-.781 2.828 0 .781.781.781 2.047 0 2.828l-4.666 4.666-2.851 8.553c-.174.522-.557.95-1.056 1.182-.499.23-1.072.246-1.585.043l-3.622-1.449-3.073 3.841c-.523.654-1.399.912-2.194.648l-5.126-1.71-4.211 2.526c-.322.194-.677.286-1.027.286z"/></svg>
\ No newline at end of file