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/1f34d.svg b/public/emoji/1f34d.svg
index ed6150475..e96999db7 100644
--- a/public/emoji/1f34d.svg
+++ b/public/emoji/1f34d.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(18.2412,26.3672)" id="g20"><path id="path22" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.277,3.307 2.17,4.72 2.17,4.72 -1.029,4.607 -2.724,1.895 -2.724,1.895 -3.476,3.194 -1.778,5.907 -0.555,6.614 -3.753,6.501 -4.225,4.494 -4.225,4.494 -5.727,7.095 -5.254,9.102 -5.254,9.102 -6.375,8.454 -7.021,6.989 -7.395,5.589 L -9.714,8.26 c -0.23,-1.046 0.156,-3.176 0.572,-4.962 -3.054,1.791 -5.902,0.151 -5.902,0.151 3.95,-1.187 5.45,-3.787 5.45,-3.787 0,0 -3.948,1.187 -5.645,-1.527 2.596,0.092 4.5,-0.499 5.856,-1.229 -1.163,-0.289 -3.145,0.236 -4.355,-1.371 0,0 3.198,0.113 3.851,-1.054 -2.172,-0.615 -3.574,-2.252 -3.574,-2.252 4.422,0.818 9.123,-1.668 9.123,-1.668 L 1.78,-5.907 C 0.752,-1.3 4.422,0.82 4.422,0.82 1.697,2.713 0,0 0,0"/></g><g transform="translate(29.5605,13.1201)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.488,-4.309 1.218,-9.7 -2.837,-12.041 -4.055,-2.341 -9.359,-0.746 -11.846,3.562 l -1.589,2.753 c -2.489,4.31 -1.218,9.699 2.837,12.04 4.055,2.342 9.359,0.747 11.846,-3.562 L 0,0 Z"/></g><g transform="translate(27.7178,9.541)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.951,0.828 -1.123,2.778 0.828,1.951 0,0 Z m -1.656,-3.901 -1.951,0.827 0.829,1.952 1.95,-0.828 -0.828,-1.951 z m -1.657,-3.904 -1.951,0.828 0.828,1.952 1.952,-0.829 -0.829,-1.951 z m -4.197,6.388 0.828,1.952 1.952,-0.829 -0.829,-1.952 -1.951,0.829 z m 0.294,-4.73 -1.95,0.828 0.828,1.95 1.95,-0.829 -0.828,-1.949 z m -4.196,6.386 0.829,1.951 1.951,-0.827 -0.829,-1.952 -1.951,0.828 z m 0.295,-4.73 -1.951,0.827 0.828,1.951 1.951,-0.828 -0.828,-1.95 z m -4.196,6.386 0.828,1.952 1.951,-0.828 -0.828,-1.953 -1.951,0.829 z m 2.484,5.852 1.951,-0.828 -0.829,-1.949 -1.95,0.828 0.828,1.949 z m 3.902,-1.655 1.95,-0.828 -0.828,-1.951 -1.95,0.828 0.828,1.951 z M -7.271,9.994 -5.319,9.165 -6.148,7.214 -8.1,8.042 -7.271,9.994 Z m 4.197,-6.387 -0.828,-1.95 -1.952,0.827 0.829,1.952 1.951,-0.829 z m -0.294,4.731 1.95,-0.829 -0.828,-1.95 -1.951,0.828 0.829,1.951 z M 2.845,1.095 C 2.636,1.942 2.305,2.779 1.843,3.579 L 1.656,3.902 1.656,3.901 -0.295,4.73 0.329,6.2 0.254,6.331 c -2.025,3.51 -5.92,5.217 -9.486,4.466 l -0.819,-1.926 -1.884,0.799 c -3.28,-2.122 -4.568,-6.318 -3.262,-10.128 l 1.006,-0.427 -0.401,-0.946 c 0.055,-0.105 0.102,-0.212 0.162,-0.315 l 1.59,-2.753 c 0.685,-1.188 1.589,-2.161 2.617,-2.91 l 0.229,0.538 1.951,-0.828 -0.324,-0.763 c 0.665,-0.278 1.357,-0.465 2.06,-0.573 l 0.215,0.507 1.403,-0.594 c 1.145,0.047 2.281,0.336 3.343,0.882 l -0.016,0.007 0.828,1.951 1.188,-0.504 c 0.523,0.522 0.973,1.104 1.334,1.737 L 0.295,-4.73 1.123,-2.778 2.79,-3.485 c 0.191,0.7 0.301,1.426 0.316,2.167 l -1.155,0.49 0.828,1.951 0.066,-0.028 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5C913B" d="M18.241 9.633c-.277-3.307 2.17-4.72 2.17-4.72-3.199.113-4.894 2.826-4.894 2.826-.752-1.3.946-4.012 2.169-4.719-3.198.113-3.67 2.12-3.67 2.12-1.503-2.601-1.03-4.607-1.03-4.607-1.121.647-1.767 2.113-2.141 3.512l-2.318-2.67c-.23 1.044.157 3.174.573 4.959-3.055-1.79-5.903-.15-5.903-.15 3.95 1.188 5.45 3.788 5.45 3.788s-3.948-1.187-5.646 1.526c2.597-.092 4.5.499 5.856 1.23-1.163.289-3.145-.236-4.355 1.371 0 0 3.198-.113 3.851 1.055-2.172.614-3.575 2.251-3.575 2.251 4.422-.818 9.123 1.669 9.123 1.669l6.119-3.532c-1.029-4.607 2.642-6.727 2.642-6.727-2.724-1.895-4.421.818-4.421.818z"/><path fill="#FFAC33" d="M29.56 22.88c2.488 4.309 1.218 9.7-2.837 12.041-4.055 2.341-9.359.746-11.846-3.562l-1.589-2.753c-2.488-4.31-1.217-9.699 2.837-12.04 4.055-2.341 9.359-.747 11.846 3.562l1.589 2.752z"/><path fill="#FFCC4D" d="M30.562 25.364c-.209-.848-.54-1.685-1.002-2.484l-.186-.323v.001l-1.951-.828.624-1.471-.075-.131c-2.025-3.51-5.92-5.217-9.486-4.466l-.818 1.926-1.884-.8c-3.28 2.122-4.567 6.319-3.262 10.128l1.006.427-.401.946c.055.105.102.212.163.315l1.589 2.753c.685 1.187 1.59 2.16 2.618 2.909l.229-.538 1.951.828-.324.764c.665.277 1.357.465 2.061.572l.215-.507 1.403.595c1.144-.048 2.28-.336 3.343-.883l-.017-.007.828-1.951 1.189.504c.522-.521.973-1.104 1.334-1.736l-1.693-.72.828-1.951 1.667.707c.191-.7.301-1.427.316-2.167l-1.155-.49.828-1.951.062.029zm-6.212-7.243l1.95.829-.828 1.95-1.951-.828.829-1.951zm.294 4.731l-.828 1.95-1.951-.827.828-1.951 1.951.828zm-4.197-6.387l1.951.828-.829 1.952-1.951-.828.829-1.952zm-1.656 3.902l1.951.828-.828 1.951-1.95-.828.827-1.951zm-3.902-1.655l1.95.828-.828 1.949-1.95-.828.828-1.949zm-2.484 5.853l.828-1.952 1.951.828-.829 1.952-1.95-.828zm4.196 6.385l-1.951-.827.828-1.951 1.951.828-.828 1.95zm-.295-4.73l.829-1.951 1.951.827-.829 1.952-1.951-.828zm4.196 6.386l-1.95-.828.828-1.95 1.95.829-.828 1.949zm-.294-4.73l.828-1.952 1.951.829-.828 1.952-1.951-.829zm4.197 6.388l-1.951-.828.828-1.951 1.951.828-.828 1.951zm1.657-3.904l-1.95-.827.828-1.952 1.95.828-.828 1.951zm1.656-3.901l-1.951-.828.828-1.95 1.951.827-.828 1.951z"/></svg>
\ No newline at end of file