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/1f935-1f3ff.svg b/public/emoji/1f935-1f3ff.svg
index da7f013d0..c38b49041 100644
--- a/public/emoji/1f935-1f3ff.svg
+++ b/public/emoji/1f935-1f3ff.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,0)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,11 c 0,2.209 -1.791,4 -4,4 l -4,0 -8,0 -4,0 c -2.209,0 -4,-1.791 -4,-4 L -24,0 0,0 Z"/></g><g transform="translate(18,1)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 -4,14 4,14 0,0 Z"/></g><g transform="translate(15.125,20.1876)" id="g28"><path id="path30" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-5.48 2.875,-6.355 5.75,-5.48 5.75,0 0,0 Z"/></g><g transform="translate(14,15)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,-6 0.5,-6.687 -0.875,-8.937 4,-14 0,0 Z"/></g><g transform="translate(22,15)" id="g36"><path id="path38" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,-6 -0.5,-6.687 0.875,-8.937 -4,-14 0,0 Z"/></g><g transform="translate(15.125,15.875)" id="g40"><path id="path42" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.875,-2.042 1,-4.031 -1.125,-0.875 0,0 Z"/></g><g transform="translate(20.875,15.875)" id="g44"><path id="path46" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.875,-2.042 -1,-4.031 1.125,-0.875 0,0 Z"/></g><g transform="translate(17.9993,13.2497)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2.066,-1.136 0,2.272 L 0,0 Z"/></g><g transform="translate(17.9993,13.2497)" id="g52"><path id="path54" style="fill:none;stroke:#292f33;stroke-width:0.46599999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 2.066,-1.136 0,2.272 L 0,0 Z"/></g><g transform="translate(17.9993,13.2497)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.066,-1.136 0,2.272 L 0,0 Z"/></g><g transform="translate(17.9993,13.2497)" id="g60"><path id="path62" style="fill:none;stroke:#292f33;stroke-width:0.46599999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 -2.066,-1.136 0,2.272 L 0,0 Z"/></g><g transform="translate(18.493,10.8618)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.273 -0.221,-0.494 -0.494,-0.494 -0.272,0 -0.493,0.221 -0.493,0.494 0,0.273 0.221,0.493 0.493,0.493 C -0.221,0.493 0,0.273 0,0"/></g><g transform="translate(18.493,8.8447)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.273 -0.221,-0.494 -0.494,-0.494 -0.272,0 -0.493,0.221 -0.493,0.494 0,0.273 0.221,0.493 0.493,0.493 C -0.221,0.493 0,0.273 0,0"/></g><g transform="translate(18.493,6.8275)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.273 -0.221,-0.494 -0.494,-0.494 -0.272,0 -0.493,0.221 -0.493,0.494 0,0.273 0.221,0.493 0.493,0.493 C -0.221,0.493 0,0.273 0,0"/></g><g transform="translate(12.25,24.4251)" id="g76"><path id="path78" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.27 -0.644,-2.3 -1.437,-2.3 -0.794,0 -1.438,1.03 -1.438,2.3 0,1.27 0.644,2.3 1.438,2.3 C -0.644,2.3 0,1.27 0,0"/></g><g transform="translate(26.625,24.4251)" id="g80"><path id="path82" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.27 -0.643,-2.3 -1.437,-2.3 -0.795,0 -1.438,1.03 -1.438,2.3 0,1.27 0.643,2.3 1.438,2.3 C -0.643,2.3 0,1.27 0,0"/></g><g transform="translate(10.525,24.5266)" id="g84"><path id="path86" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4.902 3.347,8.877 7.475,8.877 11.603,8.877 14.95,4.902 14.95,0 14.95,-4.902 11.603,-8.877 7.475,-8.877 3.347,-8.877 0,-4.902 0,0"/></g><g transform="translate(18,35.3505)" id="g88"><path id="path90" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.954,0 8.05,-3.656 8.05,-6.702 0,-3.047 -0.619,-4.266 -1.239,-3.047 -0.619,1.219 -1.238,2.437 -1.238,2.437 0,0 -3.715,0 -4.954,1.219 0,0 1.858,-3.656 -1.857,0 0,0 0.619,-2.437 -3.097,0.609 0,0 -1.857,-1.218 -2.477,-4.265 -0.171,-0.845 -1.238,0 -1.238,3.047 C -8.05,-3.656 -5.573,0 0,0"/></g><g transform="translate(20.8389,19.7529)" id="g92"><path id="path94" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.033,0.055 -0.093,0.088 -0.157,0.088 l -5.267,0 c -0.064,0 -0.123,-0.033 -0.157,-0.088 -0.033,-0.055 -0.036,-0.123 -0.006,-0.18 0.031,-0.062 0.799,-1.512 2.796,-1.512 1.999,0 2.766,1.45 2.798,1.512 C 0.036,-0.123 0.033,-0.055 0,0"/></g><g transform="translate(18.1249,22.0259)" id="g96"><path id="path98" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.57,0 -1.014,0.104 -1.369,0.262 0.117,-0.425 0.444,-1.017 1.369,-1.017 0.925,0 1.252,0.592 1.37,1.017 C 1.014,0.104 0.57,0 0,0"/></g><g transform="translate(20.5714,23.5625)" id="g100"><path id="path102" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.009,0 c -0.309,0 -0.562,0.253 -0.562,0.562 l 0,0.875 C -0.571,1.747 -0.318,2 -0.009,2 L 0,2 C 0.309,2 0.562,1.747 0.562,1.437 l 0,-0.875 C 0.562,0.253 0.309,0 0,0"/></g><g transform="translate(15.4375,23.5625)" id="g104"><path id="path106" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.009,0 c -0.309,0 -0.562,0.253 -0.562,0.562 l 0,0.875 C -0.571,1.747 -0.318,2 -0.009,2 L 0,2 C 0.309,2 0.562,1.747 0.562,1.437 l 0,-0.875 C 0.562,0.253 0.309,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M32 36v-4c0-3.314-2.685-6-6-6H10c-3.313 0-6 2.686-6 6v4h28z"/><path fill="#DFE7EC" d="M20.805 36l2.862-10.017H12.333L15.195 36z"/><path fill="#292F33" d="M18.698 31.846c0 .386-.313.699-.699.699-.386 0-.699-.313-.699-.699 0-.386.313-.699.699-.699.386 0 .699.313.699.699zm0 2.858c0 .386-.313.699-.699.699-.386 0-.699-.313-.699-.699 0-.386.313-.699.699-.699.386 0 .699.312.699.699z"/><path fill="#66757F" d="M23.29 36l-.332-.543 3.542-.974-2.833-8.5L20.805 36zm-10.58 0l.332-.543-3.542-.974 2.833-8.5L15.195 36z"/><path fill="#7C543E" d="M14 25.887l4 1.75 4-1.75v-4h-8z"/><path fill="#674232" d="M14 24c1.216 1.374 2.355 1.719 3.996 1.719 1.639 0 2.787-.346 4.004-1.719v-4h-8v4z"/><path fill="#7C543E" d="M27.833 13.935c0-1.448-.733-2.623-1.639-2.623-.082 0-.161.02-.24.039C24.73 7.546 21.635 4.839 18 4.839s-6.729 2.707-7.955 6.512c-.079-.019-.158-.039-.24-.039-.905 0-1.639 1.175-1.639 2.623 0 1.33.621 2.417 1.423 2.587.634 4.845 4.153 8.557 8.411 8.557s7.776-3.712 8.411-8.557c.802-.17 1.422-1.257 1.422-2.587z"/><path fill="#F4F7F9" d="M13.927 24.744L18 27.637l-2.656 2.818-3.011-4.472zm8.146 0L18 27.637l2.656 2.818 3.011-4.472z"/><path fill="#292F33" d="M21.045 26.653c-.072-.043-.159-.043-.231-.003L18 28.197l-2.814-1.547c-.072-.04-.159-.039-.231.003-.071.042-.115.119-.115.201v3.218c0 .082.044.159.115.201.037.021.078.032.119.032.039 0 .077-.01.112-.029L18 28.728l2.814 1.548c.035.02.073.029.112.029.041 0 .082-.011.119-.032.07-.042.114-.119.114-.201v-3.218c0-.082-.044-.159-.114-.201z"/><path fill="#3D2E24" d="M18 21.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848m.75-4.052h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path d="M22 15c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m-8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#0B0200" d="M18 1.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C8.822 5.648 11.646 1.48 18 1.48"/></svg>
\ No newline at end of file