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/1f33c.svg b/public/emoji/1f33c.svg
index 3242c56f7..4ee1cc002 100644
--- a/public/emoji/1f33c.svg
+++ b/public/emoji/1f33c.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 11.575,34.343 10.126,30.959 6.854,29.678 C 5.503,29.138 4.813,27.621 5.353,26.27 l 0,0 1.366,-3.267 -1.363,-3.181 C 4.783,18.485 5.324,17.136 6.66,16.563 l 0,0 3.259,-1.395 1.265,-3.306 c 0.27,-0.676 0.759,-1.247 1.378,-1.512 l 0,0 c 0.619,-0.265 1.37,-0.225 2.045,0.047 l 0,0 3.267,1.363 3.308,-1.416 c 1.336,-0.573 2.685,-0.032 3.257,1.305 l 0,0 1.364,3.182 3.271,1.282 c 1.35,0.541 2.041,2.057 1.5,3.406 l 0,0 -1.365,3.267 1.451,3.384 c 0.571,1.338 0.032,2.686 -1.305,3.258 l 0,0 -3.308,1.417 -1.274,3.289 c -0.27,0.675 -0.765,1.23 -1.385,1.494 l 0,0 c -0.619,0.266 -1.355,0.26 -2.029,-0.01 l 0,0 -3.268,-1.366 -3.258,1.395 c -0.358,0.153 -0.716,0.227 -1.06,0.227 l 0,0 c -0.942,0 -1.778,-0.552 -2.198,-1.531"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" 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(28.9375,8.5586)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.554,0.89 -8.111,0.429 -9.938,-1.331 l 0,11.772 c 0,0.553 -0.447,1 -1,1 -0.552,0 -1,-0.447 -1,-1 l 0,-11.772 c -1.826,1.76 -7.383,2.221 -9.937,1.331 -0.741,-0.259 5.264,-8.749 9.507,-4.507 0.168,0.168 0.306,0.33 0.43,0.49 l 0,-3.542 c 0,-0.552 0.448,-1 1,-1 0.553,0 1,0.448 1,1 l 0,3.542 c 0.125,-0.16 0.263,-0.322 0.431,-0.49 C -5.264,-8.749 0.741,-0.259 0,0"/></g><g transform="translate(12.562,10.3496)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.619,0.266 -1.107,0.837 -1.378,1.513 l -1.266,3.305 -3.258,1.395 c -1.336,0.574 -1.876,1.922 -1.304,3.259 l 1.362,3.181 -1.364,3.268 c -0.541,1.35 0.15,2.868 1.5,3.408 l 3.272,1.281 1.449,3.384 c 0.573,1.336 1.921,1.876 3.258,1.304 l 3.258,-1.396 3.267,1.366 c 0.675,0.271 1.412,0.276 2.031,0.011 0.619,-0.265 1.114,-0.82 1.384,-1.494 l 1.274,-3.29 3.309,-1.416 c 1.335,-0.573 1.875,-1.921 1.304,-3.258 L 16.647,12.437 18.012,9.17 c 0.541,-1.35 -0.15,-2.866 -1.5,-3.407 L 13.241,4.482 11.878,1.299 C 11.305,-0.037 9.956,-0.578 8.62,-0.006 L 5.312,1.411 2.045,0.047 C 1.37,-0.225 0.619,-0.265 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(18,35.7402)" id="g36"><path id="path38" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-8.82 -2.94,-9.8 -8.82,-3.92 -9.8,0 -4.165,0.98 0,0 Z"/></g><g transform="translate(6.2397,23)" id="g40"><path id="path42" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 7.84,0 0.98,-1.96 -7.105,-8.126 -4.982,3.512 c 0,0 0.082,5.635 0.246,5.553 C -2.858,-1.102 0,0 0,0"/></g><g transform="translate(18,18.1001)" id="g44"><path id="path46" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.04,-7.84 0,-7.84 -0.04,0 4.818,-2.452 5.064,-2.411 0.245,0.043 4.409,3.186 4.573,3.309 0.163,0.122 0.694,1.47 0.694,1.47 L 0.898,2.736 0,0 Z"/></g><g transform="translate(26.6973,31.6157)" id="g48"><path id="path50" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.041,-0.123 -5.921,-4.982 -5.921,-4.982 0,0 0.165,-3.185 0.327,-3.266 0.162,-0.082 9.718,-0.94 9.718,-0.94 0,0 2.491,7.555 2.368,7.473 C 6.37,-1.797 1.674,-0.082 1.797,-0.082 1.919,-0.082 0,0 0,0"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(23,23)" id="g60"><path id="path62" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.761 -2.238,-5 -5,-5 -2.761,0 -5,2.239 -5,5 0,2.761 2.239,5 5,5 2.762,0 5,-2.239 5,-5"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M28.938 27.441c-2.554-.89-8.111-.429-9.938 1.331V17c0-.553-.447-1-1-1s-1 .447-1 1v11.772c-1.827-1.76-7.384-2.221-9.938-1.331-.741.259 5.264 8.749 9.507 4.507.168-.168.306-.33.431-.49V35c0 .553.447 1 1 1s1-.447 1-1v-3.542c.125.16.263.322.431.49 4.243 4.242 10.248-4.248 9.507-4.507z"/><path fill="#CCD6DD" d="M12.562 25.65c-.619-.266-1.107-.837-1.378-1.513l-1.266-3.306-3.258-1.393c-1.336-.574-1.876-1.922-1.304-3.259l1.362-3.181-1.364-3.269c-.541-1.35.15-2.868 1.5-3.408l3.272-1.281 1.449-3.384C12.148.32 13.496-.22 14.833.352l3.258 1.396L21.358.382c.675-.271 1.411-.276 2.03-.011.619.265 1.114.819 1.385 1.494l1.274 3.29 3.309 1.417c1.336.572 1.875 1.921 1.305 3.258l-1.451 3.384 1.365 3.267c.541 1.35-.15 2.866-1.5 3.407l-3.271 1.281-1.363 3.183c-.572 1.336-1.922 1.877-3.258 1.305l-3.308-1.417-3.267 1.364c-.676.271-1.427.311-2.046.046z"/><path fill="#E1E8ED" d="M29.356 6.572l-3.309-1.417-.055-.143c-1.565 1.337-5.215 4.354-5.215 4.354l.007.123C20.015 8.879 19.057 8.5 18 8.5V1.709L14.833.353c-1.337-.572-2.685-.032-3.258 1.304l-1.449 3.384-.061.024 4.753 4.754c-.814.813-1.318 1.938-1.318 3.181H6.717l-1.361 3.178c-.572 1.337-.032 2.686 1.304 3.259l3.258 1.394.002.006 4.496-5.142c.822 1.09 2.115 1.805 3.584 1.805h.005c.006 1.979.015 5.273.012 6.801l3.164 1.356c1.336.572 2.686.031 3.258-1.305l1.362-3.18-5.192-4.517c1.14-.816 1.89-2.145 1.89-3.654 0-.071-.018-.137-.021-.208 1.802.182 4.951.472 6.822.642l-.092-.22L30.66 9.83c.571-1.337.031-2.686-1.304-3.258z"/><circle fill="#F4900C" cx="18" cy="13" r="5"/></svg>
\ No newline at end of file