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/1f486-200d-2640-fe0f.svg b/public/emoji/1f486-200d-2640-fe0f.svg
index 39ffd8bdc..de2053b8d 100644
--- a/public/emoji/1f486-200d-2640-fe0f.svg
+++ b/public/emoji/1f486-200d-2640-fe0f.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(30.0006,16.3438)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.627 -5.373,-12 -12,-12 -6.627,0 -12,5.373 -12,12 0,6.628 5.373,12 12,12 C -5.373,12 0,6.628 0,0"/></g><g transform="translate(20.0006,28)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.866 -3.134,-7 -7,-7 -3.866,0 -7,3.134 -7,7 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7"/></g><g transform="translate(8.0006,25)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.075 4.925,-11 11,-11 6.075,0 11,4.925 11,11 C 22,6.075 17.075,11 11,11 4.925,11 0,6.075 0,0"/></g><g transform="translate(30.0006,16)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -24,0 -24,12 0,9 0,0 Z"/></g><g transform="translate(27.0006,9)" id="g36"><path id="path38" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path40" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27.001,0 -1,0 0,4 1,0 0,-4 z"/><path id="path42" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10.001,0 -1,0 0,4 1,0 0,-4 z"/><g transform="translate(15.0006,14)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(14.0006,31)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,-5.308 -5,-5.936 L -5,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><g transform="translate(20.0006,14)" id="g52"><path id="path54" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.896,-1 -2,-1 -1.105,0 -2,0.447 -2,1 0,0.553 0.895,1 2,1 1.104,0 2,-0.447 2,-1"/></g><g transform="translate(19.0006,16.5)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(5.5611,30.9682)" id="g60"><path id="path62" style="fill:#e39c2f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.189,3.823 1.639,0.188 0,-2.839 3.004,-0.693 c 0.689,-0.161 1.119,-0.849 0.96,-1.538 -0.158,-0.69 -0.847,-1.12 -1.536,-0.961 L 5.168,-1.078 3.123,-3.123 C 2.781,-3.466 2.207,-3.786 1.605,-3.981 l -0.774,-6.38 c 0,0 0,-1 -0.999,-1 -0.999,0 -0.999,1 -0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(5.1685,31.3608)" id="g64"><path id="path66" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2.231,2.231 0.599,2.408 4.001,0 0,-3.467 3.001,-0.693 c 0.689,-0.161 1.119,-0.849 0.96,-1.538 -0.158,-0.69 -0.847,-1.12 -1.536,-0.961 L 5.168,-1.078 3.123,-3.123 C 2.781,-3.466 2.207,-3.786 1.605,-3.981 l -0.774,-6.38 c 0,0 0,-1 -0.999,-1 -0.999,0 -0.999,1 -0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(30.4401,30.9682)" id="g68"><path id="path70" style="fill:#e39c2f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.846,3.594 -0.982,0.417 0,-2.839 -3.004,-0.693 c -0.689,-0.161 -1.119,-0.849 -0.96,-1.538 0.158,-0.69 0.847,-1.12 1.536,-0.961 l 4.088,0.942 2.045,-2.045 c 0.342,-0.343 0.916,-0.663 1.518,-0.858 l 0.774,-6.38 c 0,0 0,-1 0.999,-1 0.999,0 0.999,1 0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(30.8327,31.3608)" id="g72"><path id="path74" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.231,2.231 -0.599,2.408 -3.998,0 0,-3.467 -3.004,-0.693 c -0.689,-0.161 -1.119,-0.849 -0.96,-1.538 0.158,-0.69 0.847,-1.12 1.536,-0.961 l 4.088,0.942 2.045,-2.045 c 0.342,-0.343 0.916,-0.663 1.518,-0.858 l 0.774,-6.38 c 0,0 0,-1 0.999,-1 0.999,0 0.999,1 0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(23.9064,20.9442)" id="g76"><path id="path78" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.088,0.071 -0.213,0.074 -0.305,0.007 -0.006,-0.005 -0.631,-0.451 -1.851,-0.451 -1.221,0 -1.846,0.446 -1.85,0.45 -0.092,0.068 -0.217,0.066 -0.306,-0.005 -0.089,-0.071 -0.119,-0.193 -0.073,-0.297 0.03,-0.067 0.75,-1.648 2.229,-1.648 1.479,0 2.199,1.581 2.228,1.648 C 0.118,-0.192 0.088,-0.071 0,0"/></g><g transform="translate(16.4063,20.9442)" id="g80"><path id="path82" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.088,0.071 -0.213,0.074 -0.305,0.007 -0.006,-0.005 -0.631,-0.451 -1.851,-0.451 -1.221,0 -1.846,0.446 -1.85,0.45 -0.092,0.068 -0.217,0.066 -0.306,-0.005 -0.089,-0.071 -0.119,-0.193 -0.073,-0.297 0.03,-0.067 0.75,-1.648 2.229,-1.648 1.479,0 2.199,1.581 2.228,1.648 C 0.118,-0.192 0.088,-0.071 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse transform="rotate(-80.781 18 19.656)" fill="#FFAC33" cx="18.001" cy="19.656" rx="12" ry="12"/><circle fill="#FFAC33" cx="13.001" cy="8" r="7"/><circle fill="#FFAC33" cx="19.001" cy="11" r="11"/><path fill="#FFAC33" d="M30.001 20h-24V8l24 3z"/><path fill="#9268CA" d="M27.001 27h-18c-2.209 0-4 1.791-4 4v5h26v-5c0-2.209-1.791-4-4-4z"/><path fill="#7450A8" d="M26.001 32h1v4h-1zm-17 0h1v4h-1z"/><path fill="#FFDC5D" d="M15.001 22v6c0 1.657 1.343 3 3 3s3-1.343 3-3v-6h-6z"/><path fill="#FFDC5D" d="M14.001 5s-.003 5.308-5 5.936V17c0 4.971 4.029 9 9 9s9-4.029 9-9v-5.019c-11.111-.376-13-6.981-13-6.981z"/><ellipse fill="#DF1F32" cx="18.001" cy="22" rx="2" ry="1"/><path fill="#C1694F" d="M19.001 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#E39C2F" d="M5.561 5.032l5.189-3.823 1.638-.188V3.86l3.004.693c.689.161 1.119.849.96 1.538-.158.689-.847 1.119-1.536.96l-4.087-.941-2.045 2.045c-.342.343-.916.663-1.517.858l-.774 6.38s0 .999-.999.999-.999-.999-.999-.999V7.398l1.166-2.366z"/><path fill="#FFDC5D" d="M5.169 4.639L7.4 2.408 7.999 0H12v3.468l3 .693c.689.161 1.119.849.96 1.538-.158.689-.847 1.119-1.536.96l-4.088-.942-2.044 2.045c-.343.343-.917.664-1.518.858L6 15.001S6 16 5.001 16s-.999-.999-.999-.999V7.005l1.167-2.366z"/><path fill="#E39C2F" d="M30.44 5.032l-5.846-3.594-.982-.417V3.86l-3.004.693c-.689.161-1.119.849-.96 1.538.158.689.847 1.119 1.536.96l4.088-.942 2.045 2.045c.343.343.916.663 1.518.858l.774 6.38s0 .999.999.999.999-.999.999-.999V7.398L30.44 5.032z"/><path fill="#FFDC5D" d="M30.833 4.639l-2.231-2.231-.6-2.408h-3.998v3.468l-3.003.692c-.689.161-1.119.849-.96 1.538.158.689.847 1.119 1.536.96l4.088-.942 2.045 2.045c.343.343.916.663 1.518.858l.774 6.38s0 .999.999.999C32 16 32 15.001 32 15.001V7.005l-1.167-2.366z"/><path fill="#662113" d="M23.906 15.056c-.088-.071-.213-.074-.305-.007-.006.005-.63.451-1.851.451-1.22 0-1.845-.446-1.85-.45-.091-.068-.217-.067-.306.004-.089.071-.119.193-.073.297.03.068.751 1.649 2.229 1.649 1.479 0 2.199-1.581 2.229-1.648.046-.104.016-.225-.073-.296zm-7.5 0c-.088-.071-.213-.074-.305-.007-.006.005-.63.451-1.851.451-1.22 0-1.845-.446-1.85-.45-.091-.068-.217-.067-.306.004-.089.071-.119.193-.073.297.03.068.751 1.649 2.229 1.649 1.479 0 2.199-1.581 2.229-1.648.045-.104.016-.225-.073-.296z"/></svg>
\ No newline at end of file