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/1f941.svg b/public/emoji/1f941.svg
index 7a7027b7e..e197d16c3 100644
--- a/public/emoji/1f941.svg
+++ b/public/emoji/1f941.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,9 36,9 36,18 0,18 0,9 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(36,10)" id="g22"><path id="path24" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -8.059,-9 -18,-9 -9.941,0 -18,4.029 -18,9 0,4.971 8.059,9 18,9 C -8.059,9 0,4.971 0,0"/></g><g transform="translate(36,9)" id="g26"><path id="path28" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -8.059,-9 -18,-9 -9.941,0 -18,4.029 -18,9 0,4.971 8.059,9 18,9 C -8.059,9 0,4.971 0,0"/></g><g transform="translate(0,26)" id="g30"><path id="path32" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-16 0.117,0 c 0.996,-4.499 8.619,-8 17.883,-8 9.264,0 16.887,3.501 17.883,8 L 36,-16 36,0 0,0 Z"/></g><g transform="translate(36,25)" id="g34"><path id="path36" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -8.059,-9 -18,-9 -9.941,0 -18,4.029 -18,9 0,4.971 8.059,9 18,9 C -8.059,9 0,4.971 0,0"/></g><g transform="translate(36,24)" id="g38"><path id="path40" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -8.059,-9 -18,-9 -9.941,0 -18,4.029 -18,9 0,4.971 8.059,9 18,9 C -8.059,9 0,4.971 0,0"/></g><path id="path42" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1,24 -1,0 0,2 1,0 0,-2 z"/><path id="path44" style="fill:#f18f26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,24 -1,0 0,2 1,0 0,-2 z"/><g transform="translate(36,26)" id="g46"><path id="path48" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -8.059,-9 -18,-9 -9.941,0 -18,4.029 -18,9 0,4.971 8.059,9 18,9 C -8.059,9 0,4.971 0,0"/></g><g transform="translate(35,26)" id="g50"><path id="path52" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.418 -7.611,-8 -17,-8 -9.389,0 -17,3.582 -17,8 0,4.418 7.611,8 17,8 C -7.611,8 0,4.418 0,0"/></g><g transform="translate(18,33)" id="g54"><path id="path56" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 9.03,0 16.395,-3.316 16.946,-7.5 16.968,-7.334 17,-7.169 17,-7 17,-2.582 9.389,1 0,1 c -9.389,0 -17,-3.582 -17,-8 0,-0.169 0.032,-0.334 0.054,-0.5 C -16.395,-3.316 -9.03,0 0,0"/></g><g transform="translate(28.6011,33.4011)" id="g58"><path id="path60" style="fill:#aa695b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.44,0.33 0.53,0.96 0.2,1.4 L -0.4,2.2 C -0.73,2.64 -1.36,2.73 -1.8,2.4 L -14.444,-7.644 c -0.774,0.167 -1.785,-0.083 -2.673,-0.749 -1.326,-0.994 -1.863,-2.516 -1.2,-3.4 0.663,-0.883 2.274,-0.794 3.6,0.2 0.835,0.626 1.355,1.461 1.462,2.215 L 0,0 Z"/></g><g transform="translate(34.4695,30.4824)" id="g62"><path id="path64" style="fill:#aa695b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.509,0.861 c -0.28,0.473 -0.896,0.632 -1.369,0.352 l -13.913,-8.751 c -0.719,0.141 -1.626,-0.023 -2.473,-0.523 -1.426,-0.843 -2.127,-2.297 -1.565,-3.248 0.562,-0.951 2.174,-1.039 3.6,-0.196 1.005,0.594 1.638,1.49 1.735,2.301 L -0.352,-1.37 C 0.121,-1.09 0.28,-0.474 0,0"/></g><g transform="translate(2,8)" id="g66"><path id="path68" style="fill:#da2f47;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,9 c 0,0.55 0.45,1 1,1 l 0,0 c 0.55,0 1,-0.45 1,-1 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(11,4)" id="g70"><path id="path72" style="fill:#da2f47;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,9 c 0,0.55 0.45,1 1,1 l 0,0 c 0.55,0 1,-0.45 1,-1 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(23,4)" id="g74"><path id="path76" style="fill:#da2f47;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,9 c 0,0.55 0.45,1 1,1 l 0,0 c 0.55,0 1,-0.45 1,-1 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(34,8)" id="g78"><path id="path80" style="fill:#da2f47;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,9 c 0,0.55 0.45,1 1,1 0.55,0 1,-0.45 1,-1 L 1,1 C 1,0.45 0.55,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F18F26" d="M0 18h36v9H0z"/><ellipse fill="#F18F26" cx="18" cy="26" rx="18" ry="9"/><ellipse fill="#F18F26" cx="18" cy="27" rx="18" ry="9"/><path fill="#9D0522" d="M0 10v16h.117c.996 4.499 8.619 8 17.883 8s16.887-3.501 17.883-8H36V10H0z"/><ellipse fill="#F18F26" cx="18" cy="11" rx="18" ry="9"/><ellipse fill="#F18F26" cx="18" cy="12" rx="18" ry="9"/><path fill="#F18F26" d="M0 10h1v2H0zm35 0h1v2h-1z"/><ellipse fill="#FCAB40" cx="18" cy="10" rx="18" ry="9"/><ellipse fill="#F5F8FA" cx="18" cy="10" rx="17" ry="8"/><path fill="#FDD888" d="M18 3c9.03 0 16.395 3.316 16.946 7.5.022-.166.054-.331.054-.5 0-4.418-7.611-8-17-8S1 5.582 1 10c0 .169.032.334.054.5C1.605 6.316 8.97 3 18 3z"/><path d="M28.601 2.599c.44-.33.53-.96.2-1.4l-.6-.8c-.33-.44-.96-.53-1.4-.2L14.157 10.243c-.774-.167-1.785.083-2.673.749-1.326.994-1.863 2.516-1.2 3.4s2.275.794 3.6-.2c.835-.626 1.355-1.461 1.462-2.215l13.255-9.378zm5.868 2.919l-.509-.861c-.28-.474-.896-.632-1.37-.352l-13.913 8.751c-.719-.141-1.626.023-2.472.524-1.426.843-2.127 2.297-1.565 3.248.562.951 2.174 1.039 3.6.196 1.005-.594 1.638-1.49 1.735-2.301l14.142-7.835c.474-.281.632-.897.352-1.37z" fill="#AA695B"/><path fill="#DA2F47" d="M2 28c-.55 0-1-.45-1-1v-9c0-.55.45-1 1-1s1 .45 1 1v9c0 .55-.45 1-1 1zm9 4c-.55 0-1-.45-1-1v-9c0-.55.45-1 1-1s1 .45 1 1v9c0 .55-.45 1-1 1zm12 0c-.55 0-1-.45-1-1v-9c0-.55.45-1 1-1s1 .45 1 1v9c0 .55-.45 1-1 1zm11-4c-.55 0-1-.45-1-1v-9c0-.55.45-1 1-1s1 .45 1 1v9c0 .55-.45 1-1 1z"/></svg>
\ No newline at end of file