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/267f.svg b/public/emoji/267f.svg
index a082dbd57..b1d1c4241 100644
--- a/public/emoji/267f.svg
+++ b/public/emoji/267f.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(36,4)" id="g20"><path id="path22" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(30,29)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.344,-3 -3,-3 -1.656,0 -3,1.343 -3,3 0,1.657 1.344,3 3,3 1.656,0 3,-1.343 3,-3"/></g><g transform="translate(13.0601,22.9399)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.367,2.366 6.226,1.209 3.591,-1.638 C 5.357,-2.332 6.873,-3.513 7.983,-5.017 L 12.999,0 c 0.373,0.373 0.524,0.916 0.394,1.427 -0.129,0.512 -0.518,0.919 -1.023,1.07 l -9.999,3 C 1.842,5.657 1.269,5.512 0.879,5.121 l -3,-3 C -2.707,1.536 -2.707,0.586 -2.121,0 -1.535,-0.586 -0.586,-0.586 0,0"/></g><g transform="translate(29.125,17.9912)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.316,0.359 -0.787,0.549 -1.262,0.503 l -6.786,-0.617 c 0.632,-0.867 1.135,-1.833 1.464,-2.879 l 3.548,0.322 -1.554,-6.995 c -0.18,-0.809 0.33,-1.609 1.139,-1.789 0.109,-0.024 0.219,-0.036 0.326,-0.036 0.689,0 1.308,0.475 1.463,1.175 l 2,9 C 0.442,-0.849 0.316,-0.36 0,0"/></g><g transform="translate(12.9995,6)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.313,0 -6,2.686 -6,6 0,3.314 2.687,6.001 6,6.001 C 3.314,12.001 6.001,9.314 6.001,6 6.001,2.686 3.314,0 0,0 m 0,14 c -4.418,0 -7.999,-3.582 -7.999,-8 0,-4.418 3.581,-8 7.999,-8 4.419,0 8.001,3.582 8.001,8 0,4.418 -3.582,8 -8.001,8"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#269" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><circle fill="#FFF" cx="27" cy="7" r="3"/><path fill="#FFF" d="M13.06 13.06l2.367-2.366 3.859 1.158-2.635 2.847c1.766.694 3.282 1.875 4.392 3.379l5.017-5.017c.373-.373.523-.916.393-1.427-.129-.512-.518-.918-1.023-1.07l-9.999-3c-.529-.16-1.102-.015-1.492.376l-3 3c-.586.585-.586 1.536 0 2.121s1.535.585 2.121-.001zm16.065 4.949c-.316-.359-.787-.549-1.262-.503l-6.786.617c.632.867 1.135 1.833 1.464 2.879l3.548-.322-1.554 6.995c-.18.809.33 1.609 1.139 1.789.109.024.219.036.326.036.688 0 1.308-.476 1.463-1.175l2-9c.104-.468-.022-.956-.338-1.316zM13 16c-4.418 0-8 3.582-8 8s3.582 8 8 8 8-3.582 8-8-3.582-8-8-8zm0 14c-3.313 0-6-2.687-6-6s2.687-6 6-6c3.314 0 6 2.687 6 6s-2.687 6-6 6z"/></svg>
\ No newline at end of file