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/1f478.svg b/public/emoji/1f478.svg
index 06d437fa6..9704853c6 100644
--- a/public/emoji/1f478.svg
+++ b/public/emoji/1f478.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(18,32.0005)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 6,0 16,-3 16,-16 0,-13 0,-16 -3,-16 -3,0 -7,3 -13,3 -6,0 -9.915,-3 -13,-3 -3.343,0 -3,12 -3,16 0,13 10,16 16,16"/></g><g transform="translate(6,16.4375)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,8.526 5.373,15.438 12,15.438 18.627,15.438 24,8.526 24,0 24,-8.525 18.627,-15.438 12,-15.438 5.373,-15.438 0,-8.525 0,0"/></g><g transform="translate(18,5)" id="g28"><path id="path30" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.347,0 -3.575,1.16 -3.707,1.293 -0.391,0.391 -0.391,1.023 0,1.414 0.387,0.388 1.013,0.39 1.404,0.01 C -2.251,2.67 -1.497,2 0,2 1.519,2 2.273,2.689 2.305,2.719 2.704,3.093 3.332,3.082 3.713,2.689 4.092,2.297 4.093,1.679 3.707,1.293 3.575,1.16 2.347,0 0,0"/></g><g transform="translate(19,10)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(3.0645,11)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0.325 -0.064,0.648 -0.064,1 0,5.001 3,-0.563 3,3 0,3.564 2,4.001 4,6.001 l 3,3 c 0,0 5,-3 9,-3 4,0 8,-2.001 8,-6.001 0,-4 3,2.001 3,-3 0,-0.355 -0.034,-0.673 -0.058,-1 l 1.049,0 c 0.009,1.477 0.009,3.132 0.009,5 0,13 -10,18 -16,18 -6,0 -16,-5 -16,-18 0,-1.158 -0.029,-2.986 0.012,-5 L 0,0 Z"/></g><g transform="translate(8,30)" id="g40"><path id="path42" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 20,0 20,1 17,2 15,5 12,4 10,6 8,4 5,5 3,2 0,1 0,0 Z"/></g><g transform="translate(17,32.5005)" id="g44"><path id="path46" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.829 0.448,1.5 1,1.5 1.553,1.5 2,0.829 2,0 2,-0.829 1.553,-1.5 1,-1.5 0.448,-1.5 0,-0.829 0,0"/></g><g transform="translate(13,32.0005)" id="g48"><path id="path50" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.448,1 1,1 1.552,1 2,0.552 2,0 2,-0.552 1.552,-1 1,-1 0.448,-1 0,-0.552 0,0"/></g><g transform="translate(21,32.0005)" id="g52"><path id="path54" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.447,1 1,1 1.553,1 2,0.552 2,0 2,-0.552 1.553,-1 1,-1 0.447,-1 0,-0.552 0,0"/></g><g transform="translate(13,13)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,2 C -1,3.553 -0.552,4 0,4 0.552,4 1,3.553 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(23,13)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.553 -0.553,4 0,4 0.553,4 1,3.553 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M18 4c6 0 16 3 16 16s0 16-3 16-7-3-13-3-9.915 3-13 3c-3.343 0-3-12-3-16C2 7 12 4 18 4z"/><path fill="#FFDC5D" d="M6 19.562c0-8.526 5.373-15.438 12-15.438s12 6.912 12 15.438S24.627 35 18 35 6 28.088 6 19.562z"/><path fill="#DF1F32" d="M18 31c-2.347 0-3.575-1.16-3.707-1.293-.391-.391-.391-1.023 0-1.414.387-.388 1.013-.39 1.404-.01.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719.399-.374 1.027-.363 1.408.029.379.393.38 1.011-.006 1.397C21.575 29.84 20.347 31 18 31z"/><path fill="#C1694F" d="M19 26h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#FFAC33" d="M3.064 25c-.03-.325-.064-.647-.064-1 0-5 3 .562 3-3 0-3.563 2-4 4-6l3-3s5 3 9 3 8 2 8 6 3-2 3 3c0 .355-.033.673-.058 1h1.049C34 23.523 34 21.868 34 20 34 7 24 2 18 2S2 7 2 20c0 1.158-.028 2.986.012 5h1.052z"/><path fill="#A7A9AC" d="M8 6h20V5l-3-1-2-3-3 1-2-2-2 2-3-1-2 3-3 1z"/><ellipse fill="#F1F2F2" cx="18" cy="3.5" rx="1" ry="1.5"/><circle fill="#F1F2F2" cx="14" cy="4" r="1"/><circle fill="#F1F2F2" cx="22" cy="4" r="1"/><path fill="#662113" d="M13 23c-.552 0-1-.447-1-1v-2c0-.553.448-1 1-1s1 .447 1 1v2c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1s1 .447 1 1v2c0 .553-.447 1-1 1z"/></svg>
\ No newline at end of file