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/1f4e6.svg b/public/emoji/1f4e6.svg
index d0b8d6d1d..1ce096119 100644
--- a/public/emoji/1f4e6.svg
+++ b/public/emoji/1f4e6.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(4,25)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-12.375 c 0,-2.042 1.093,-2.484 1.093,-2.484 0,0 9.752,-7.667 11.574,-9.099 1.821,-1.432 1.333,1.583 1.333,1.583 L 14,-11 0,0 Z"/></g><g transform="translate(32,25)" id="g24"><path id="path26" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-12.375 c 0,-2.042 -1.063,-2.484 -1.063,-2.484 0,0 -9.767,-7.667 -11.588,-9.099 -1.823,-1.432 -1.349,1.583 -1.349,1.583 L -14,-11 0,0 Z"/></g><g transform="translate(19.2891,35.5)" id="g28"><path id="path30" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.754,0.61 -1.988,0.61 -2.742,0 l -11.982,-9.529 c -0.754,-0.61 -0.754,-1.607 0,-2.216 l 12.023,-9.647 c 0.755,-0.609 1.989,-0.609 2.743,0 l 12.103,9.731 c 0.754,0.609 0.754,1.606 0,2.216 L 0,0 Z"/></g><g transform="translate(18,0.25)" id="g32"><path id="path34" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.482 -1,1.078 l 0,12.927 c 0,0.596 0.448,1.078 1,1.078 0.553,0 1,-0.482 1,-1.078 L 1,1.078 C 1,0.482 0.553,0 0,0"/></g><g transform="translate(28,17.1641)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 0.105,-1.646 -1,-2.442 L -3.469,-4.32 C -4.573,-5.117 -5,-4.433 -5,-3.328 l 0,2.961 c 0,0.193 -0.026,0.4 -0.278,0.608 -2.578,2.125 -12.588,10.076 -14.412,11.544 l 4.625,3.678 C -13.799,14.537 -4.312,7.211 -0.344,4.086 -0.145,3.93 0,3.758 0,3.57 L 0,0 Z"/></g><g transform="translate(27.6563,21.25)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.969,3.125 -13.456,10.451 -14.722,11.377 l -1.72,-1.368 -2.905,-2.31 c 1.825,-1.468 11.834,-9.419 14.412,-11.544 0.152,-0.125 0.217,-0.25 0.248,-0.371 l 4.934,3.967 C 0.187,-0.163 0.101,-0.079 0,0"/></g><g transform="translate(28,17.1641)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3.57 c 0,0.188 -0.145,0.36 -0.344,0.516 -3.968,3.125 -13.455,10.451 -14.721,11.377 l -2.074,-1.649 C -13.746,11.145 -4.657,4.133 -2.278,2.241 -2.022,2.037 -2,1.826 -2,1.633 l 0,-4.836 1,0.761 C 0.105,-1.646 0,-1.104 0,0"/></g><g transform="translate(27.6563,21.25)" id="g48"><path id="path50" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.969,3.125 -13.456,10.451 -14.722,11.377 l -2.073,-1.649 c 3.393,-2.669 12.482,-9.681 14.86,-11.573 0.038,-0.029 0.06,-0.059 0.087,-0.089 l 2.095,1.685 C 0.187,-0.163 0.101,-0.079 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M4 11v12.375c0 2.042 1.093 2.484 1.093 2.484l11.574 9.099C18.489 36.39 18 33.375 18 33.375V22L4 11z"/><path fill="#C1694F" d="M32 11v12.375c0 2.042-1.063 2.484-1.063 2.484s-9.767 7.667-11.588 9.099C17.526 36.39 18 33.375 18 33.375V22l14-11z"/><path fill="#D99E82" d="M19.289.5c-.753-.61-1.988-.61-2.742 0L4.565 10.029c-.754.61-.754 1.607 0 2.216l12.023 9.646c.754.609 1.989.609 2.743 0l12.104-9.73c.754-.609.754-1.606 0-2.216L19.289.5z"/><path fill="#D99E82" d="M18 35.75c-.552 0-1-.482-1-1.078V21.745c0-.596.448-1.078 1-1.078.553 0 1 .482 1 1.078v12.927c0 .596-.447 1.078-1 1.078z"/><path fill="#99AAB5" d="M28 18.836c0 1.104.104 1.646-1 2.442l-2.469 1.878c-1.104.797-1.531.113-1.531-.992v-2.961c0-.193-.026-.4-.278-.608C20.144 16.47 10.134 8.519 8.31 7.051l4.625-3.678c1.266.926 10.753 8.252 14.722 11.377.197.156.343.328.343.516v3.57z"/><path fill="#CCD6DD" d="M27.656 14.75C23.688 11.625 14.201 4.299 12.935 3.373l-1.721 1.368-2.904 2.31c1.825 1.468 11.834 9.419 14.412 11.544.151.125.217.25.248.371L27.903 15c-.06-.087-.146-.171-.247-.25z"/><path fill="#CCD6DD" d="M28 18.836v-3.57c0-.188-.146-.359-.344-.516-3.968-3.125-13.455-10.451-14.721-11.377l-2.073 1.649c3.393 2.669 12.481 9.681 14.86 11.573.256.204.278.415.278.608v4.836l1-.761c1.104-.797 1-1.338 1-2.442z"/><path fill="#E1E8ED" d="M27.656 14.75C23.688 11.625 14.201 4.299 12.935 3.373l-2.073 1.649c3.393 2.669 12.481 9.681 14.86 11.573.037.029.06.059.087.088L27.903 15c-.06-.087-.146-.171-.247-.25z"/></svg>
\ No newline at end of file