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/1f9dd-1f3fb.svg b/public/emoji/1f9dd-1f3fb.svg
index 84d9dd8f5..95c77d46d 100644
--- a/public/emoji/1f9dd-1f3fb.svg
+++ b/public/emoji/1f9dd-1f3fb.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,22)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1,-14 -1,-19 L 10,-19 10,1 0,0 Z"/></g><g transform="translate(28,22)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,-14 1,-19 l -11,0 0,20 10,-1 z"/></g><g transform="translate(18,24)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,8 c -5,0 -10,-3 -10,-9 0,-6 2.553,-0.894 3,0 2,4 5,1 7,1"/></g><g transform="translate(18,24)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,8 C 5,8 10,5 10,-1 10,-7 7.447,-1.894 7,-1 5,3 2,0 0,0"/></g><g transform="translate(32,0)" id="g36"><path id="path38" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(13.6397,7.899)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.267 2.848,-1.962 4.36,-1.962 1.512,0 2.616,0.696 4.36,1.962 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6318,10.0272)" id="g44"><path id="path46" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(9.4777,19.0403)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.522,10.121 4.707,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.816,-10.12 -8.523,-10.12 C 3.816,-10.12 0,-5.589 0,0"/></g><g transform="translate(18,12.1978)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.706 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.255 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.787 4.011,1.531 3.997,1.104 3.741,0.848 3.6,0.706 2.754,0 0,0"/></g><g transform="translate(14,19)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 c 0,0.55 0.45,1 1,1 L 0,3 C 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22,19)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 c 0,0.55 0.45,1 1,1 L 0,3 C 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g64"><path id="path66" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(8,21.72)" id="g68"><path id="path70" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.868,-1.849 c 0,0 1.192,-3.4 0,-3.996 C -0.796,-7.177 -3,-0.332 -3,1 -3,2 0,0 0,0"/></g><g transform="translate(27.3974,21.72)" id="g72"><path id="path74" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.868,-1.849 c 0,0 -1.192,-3.4 0,-3.996 C 0.796,-7.177 3.603,-0.332 3.603,1 3.603,2 0,0 0,0"/></g><g transform="translate(18,32)" id="g76"><path id="path78" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5,0 -9,-3 -9,-9 0,-6 1.553,-0.894 2,0 2,4 5,3 7,3 2,0 5,1 7,-3 0.447,-0.894 2,-6 2,0 0,6 -4,9 -9,9"/></g><g transform="translate(9,23)" id="g80"><path id="path82" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-23 4,0 C 3,-23 0.373,-2.516 2,0 2.698,1.08 0,0 0,0"/></g><g transform="translate(27.0577,23)" id="g84"><path id="path86" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1,-23 -4.058,0 c 0,0 2.685,20.484 1.058,23 -0.698,1.08 2,0 2,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M8 14S7 28 7 33h11V13L8 14zm20 0s1 14 1 19H18V13l10 1z"/><path fill="#662113" d="M18 12V4C13 4 8 7 8 13s2.553.894 3 0c2-4 5-1 7-1zm0 0V4c5 0 10 3 10 9s-2.553.894-3 0c-2-4-5-1-7-1z"/><path fill="#3B88C3" d="M32 36v-2c0-3.313-2.687-6-6-6H10c-3.313 0-6 2.687-6 6v2h28z"/><path fill="#F7DECE" d="M13.64 28.101c1.744 1.267 2.848 1.962 4.36 1.962 1.511 0 2.616-.696 4.36-1.962V24.29h-8.72v3.811z"/><path fill="#EEC2AD" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.147-.372 4.364-1.746v-3.491h-8.728v3.491z"/><path fill="#F7DECE" d="M9.478 16.96c0-5.589 3.816-10.121 8.522-10.121s8.522 4.531 8.522 10.121c0 5.589-3.816 10.12-8.522 10.12s-8.522-4.531-8.522-10.12z"/><path fill="#C1694F" d="M18 23.802c-2.754 0-3.6-.706-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.645-.255.902-.024.052.038.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.255-.255.656-.243.913.013.256.256.242.684-.014.94-.141.143-.987.849-3.741.849z"/><path fill="#662113" d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1zm8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1z"/><path fill="#C1694F" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75z"/><path fill="#F7DECE" d="M8 14.28l1.868 1.849s1.192 3.401 0 3.997C7.204 21.457 5 14.612 5 13.28c0-1 3 1 3 1zm19.397 0l-1.868 1.849s-1.192 3.401 0 3.997C28.194 21.457 31 14.612 31 13.28c0-1-3.603 1-3.603 1z"/><path fill="#662113" d="M18 4c-5 0-9 3-9 9s1.553.894 2 0c2-4 5-3 7-3s5-1 7 3c.447.894 2 6 2 0s-4-9-9-9z"/><path fill="#662113" d="M9 13L8 36h4s-2.627-20.484-1-23c.698-1.08-2 0-2 0zm18.058 0l1 23H24s2.685-20.484 1.058-23c-.698-1.08 2 0 2 0z"/></svg>
\ No newline at end of file