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/1f426.svg b/public/emoji/1f426.svg
index 2760fec59..06d93a916 100644
--- a/public/emoji/1f426.svg
+++ b/public/emoji/1f426.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.9164,23.1204)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.111,-1.652 1.768,-3.126 -0.712,-2.959 -2.48,0.167 -7.836,2.533 -7.769,3.531 0.067,0.997 3.709,2.756 6.188,2.589 C 0.187,2.994 0.111,1.653 0,0"/></g><g transform="translate(29.0378,7.0709)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.202,0.032 -0.392,-0.015 -0.564,-0.095 -2.889,-0.327 -3.789,1.79 -3.789,1.79 -4.229,2.126 -4.771,3.8 -5.378,3.005 l 0.187,-1.402 c 0.187,-1.401 2.57,-3.224 2.57,-3.224 l -1.215,-1.588 c -0.336,-0.44 -0.253,-1.067 0.187,-1.402 0.439,-0.336 1.066,-0.252 1.401,0.187 l 0.673,0.879 -0.039,-0.249 c -0.087,-0.546 0.285,-1.058 0.831,-1.144 0.546,-0.087 1.058,0.285 1.144,0.831 l 0.47,2.962 C 0.918,-0.599 0.546,-0.087 0,0"/></g><g transform="translate(22.7603,6.448)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.196,0.058 -0.39,0.037 -0.572,-0.018 -2.335,0.081 -2.943,2.3 -2.943,2.3 -0.391,0.391 -0.704,2.122 -1.412,1.417 L -4.93,2.284 c -0.002,-1.414 2.115,-3.539 2.115,-3.539 l -1.417,-1.412 c -0.391,-0.39 -0.392,-1.022 -0.002,-1.414 0.39,-0.391 1.022,-0.393 1.414,-0.002 l 0.785,0.781 -0.073,-0.241 c -0.159,-0.53 0.141,-1.087 0.67,-1.246 0.53,-0.159 1.087,0.141 1.246,0.67 L 0.67,-1.246 C 0.829,-0.716 0.529,-0.159 0,0"/></g><g transform="translate(35.009,29.2706)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.383,0.17 -0.758,0.057 -1.05,-0.244 -0.054,-0.056 -4.225,-6.307 -14.532,-4.944 -0.34,0.045 3.139,-11.968 3.199,-11.962 0.124,0.015 3.07,0.369 6.139,2.553 2.818,2.005 6.285,5.992 6.797,13.598 C 0.582,-0.58 0.383,-0.171 0,0"/></g><g transform="translate(34.4766,14.8915)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.204,0.336 -0.59,0.56 -0.979,0.471 -1.294,-0.295 -3.197,-0.542 -4.53,-0.453 -6.357,0.429 -9.361,4.129 -9.392,4.161 -0.275,0.282 0.465,-11.552 0.816,-11.576 9.194,-0.619 13.862,6.027 14.057,6.31 C 0.194,-0.761 0.205,-0.336 0,0"/></g><g transform="translate(24.5862,16.9841)" id="g40"><path id="path42" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.371,-5.51 1.316,-9.861 -4.194,-9.489 -5.511,0.371 -10.146,4.92 -9.774,10.43 C -13.597,6.452 0.371,5.51 0,0"/></g><g transform="translate(23.2566,23.5885)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.353,-5.235 -3.922,-9.257 -9.156,-8.904 -5.235,0.352 -9.193,4.882 -8.84,10.117 0.353,5.235 4.832,8.444 10.067,8.091 C -3.928,9.035 0.311,4.621 0,0"/></g><g transform="translate(12.6658,26.8768)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.074,-1.102 -1.028,-1.935 -2.13,-1.861 -1.102,0.074 -1.935,1.028 -1.861,2.13 0.074,1.102 1.028,1.935 2.13,1.861 C -0.759,2.056 0.074,1.102 0,0"/></g><g transform="translate(18.179,19.3547)" id="g52"><path id="path54" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 7.63,-5.648 12.387,4.459 12.783,5.301 14.071,3.666 12.486,0.297 10.9,-3.072 4.311,-6.143 0.446,-1.239 -0.369,-0.204 0,0 0,0"/></g><g transform="translate(15.3273,32.8927)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 6.246,-0.254 7.798,0.477 9.351,1.207 7.935,-2.456 4.536,-3.313 1.137,-4.169 0,0 0,0"/></g><g transform="translate(17.4279,30.2119)" id="g60"><path id="path62" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 4.501,-0.136 6.054,0.594 7.606,1.325 6.19,-2.338 2.791,-3.195 -0.607,-4.052 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M8.916 12.88c-.111 1.652 1.768 3.126-.712 2.959-2.48-.167-7.836-2.533-7.768-3.53s3.708-2.757 6.188-2.59c2.48.166 2.404 1.508 2.292 3.161zm20.122 16.049c-.202-.032-.392.015-.564.095-2.325.232-3.225-1.885-3.225-1.885-.439-.336-.981-2.009-1.589-1.215l.187 1.402c.187 1.402 2.57 3.224 2.57 3.224l-1.215 1.589c-.336.439-.252 1.066.187 1.402.439.336 1.066.252 1.402-.187l.673-.88-.039.249c-.087.546.285 1.058.831 1.145.546.087 1.058-.285 1.145-.831l.47-2.963c.085-.546-.287-1.058-.833-1.145zm-6.278.623c-.196-.058-.39-.037-.572.018-2.335-.082-2.944-2.3-2.944-2.3-.39-.392-.703-2.123-1.412-1.417l-.003 1.414c-.003 1.414 2.115 3.539 2.115 3.539l-1.417 1.412c-.392.39-.393 1.023-.003 1.414.39.392 1.023.393 1.414.003l.785-.782-.073.242c-.159.529.141 1.086.67 1.246.529.159 1.087-.141 1.246-.67l.862-2.873c.162-.53-.138-1.087-.668-1.246z"/><path fill="#DD2E44" d="M35.009 6.729c-.383-.17-.758-.057-1.05.244-.054.056-4.225 6.306-14.532 4.944-.34-.045 3.139 11.968 3.199 11.962.124-.014 3.07-.368 6.14-2.553 2.818-2.005 6.284-5.991 6.797-13.598.028-.418-.171-.828-.554-.999z"/><path fill="#DD2E44" d="M34.477 21.108c-.204-.336-.59-.56-.979-.471-1.293.295-3.197.543-4.53.453-6.357-.428-9.361-4.129-9.392-4.16-.275-.282.466 11.552.816 11.576 9.194.62 13.862-6.027 14.057-6.31.222-.326.233-.751.028-1.088z"/><path fill="#DD2E44" d="M24.586 19.016c-.371 5.51 1.316 9.861-4.194 9.489-5.51-.371-10.145-4.92-9.774-10.431s14.34-4.568 13.968.942z"/><path fill="#DD2E44" d="M23.257 12.412c-.353 5.235-3.922 9.257-9.156 8.904-5.235-.353-9.193-4.882-8.84-10.117.353-5.235 4.832-8.444 10.067-8.091 4.001.269 8.24 4.683 7.929 9.304z"/><circle fill="#292F33" cx="10.67" cy="8.989" r="2"/><path fill="#A0041E" d="M18.179 16.645s7.63 5.648 12.387-4.459c.396-.842 1.685.793.099 4.162s-8.175 6.44-12.04 1.536c-.815-1.035-.446-1.239-.446-1.239z"/><path fill="#DD2E44" d="M15.327 3.107s6.246.254 7.798-.477.136 2.932-3.262 3.789-4.536-3.312-4.536-3.312z"/><path fill="#DD2E44" d="M17.428 5.788s4.501.136 6.054-.594.136 2.932-3.262 3.789c-3.399.857-2.792-3.195-2.792-3.195z"/></svg>
\ No newline at end of file