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/1f47c.svg b/public/emoji/1f47c.svg
index f83cb7704..1233b93ae 100644
--- a/public/emoji/1f47c.svg
+++ b/public/emoji/1f47c.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(0.0054,5.9072)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.003,-0.015 -0.004,-0.027 -0.005,-0.041 0.001,-0.11 0.02,-0.215 0.031,-0.322 0.009,-0.074 0.011,-0.151 0.021,-0.225 0.015,-0.069 0.032,-0.137 0.046,-0.2 0.617,-2.893 4.333,-5.119 8.842,-5.119 4.505,0 8.224,2.226 8.838,5.119 0.018,0.066 0.035,0.131 0.046,0.199 0.012,0.074 0.015,0.152 0.022,0.227 0.012,0.106 0.031,0.211 0.033,0.321 0,0.015 -0.005,0.028 -0.006,0.041 0.001,0.018 0.004,0.035 0.006,0.053 l -0.009,0 c -0.051,1.652 -1.358,2.979 -2.971,2.979 -1.617,0 -2.923,-1.327 -2.973,-2.979 l -0.017,0 c 10e-4,0.031 0.009,0.06 0.009,0.093 0,1.696 -1.334,3.072 -2.98,3.072 C 7.289,3.218 5.955,1.844 5.954,0.146 5.955,0.113 5.962,0.083 5.965,0.053 l -0.019,0 C 5.896,1.705 4.59,3.032 2.974,3.032 1.359,3.032 0.053,1.705 0.004,0.053 L -0.005,0.054 C -0.005,0.035 0,0.018 0,0"/></g><g transform="translate(18.0889,5.9072)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.004,-0.015 -0.005,-0.027 -0.006,-0.041 0.001,-0.11 0.02,-0.215 0.031,-0.322 0.01,-0.074 0.011,-0.151 0.022,-0.225 0.014,-0.069 0.031,-0.137 0.046,-0.2 0.616,-2.893 4.333,-5.119 8.841,-5.119 4.505,0 8.224,2.226 8.838,5.119 0.018,0.066 0.036,0.131 0.046,0.199 0.012,0.074 0.016,0.152 0.023,0.227 0.012,0.106 0.03,0.211 0.032,0.321 0,0.015 -0.004,0.028 -0.006,0.041 0.002,0.018 0.004,0.035 0.006,0.053 l -0.009,0 c -0.051,1.652 -1.357,2.979 -2.97,2.979 -1.617,0 -2.923,-1.327 -2.973,-2.979 l -0.018,0 c 10e-4,0.031 0.009,0.06 0.009,0.093 0,1.696 -1.334,3.072 -2.979,3.072 C 7.289,3.218 5.955,1.844 5.953,0.146 5.955,0.113 5.962,0.083 5.965,0.053 l -0.02,0 C 5.895,1.705 4.59,3.032 2.974,3.032 1.358,3.032 0.053,1.705 0.004,0.053 l -0.01,0.001 C -0.006,0.035 0,0.018 0,0"/></g><g transform="translate(30,15)" id="g28"><path id="path30" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.627 -5.373,-12 -12,-12 -6.627,0 -12,5.373 -12,12 0,6.627 5.373,12 12,12 C -5.373,12 0,6.627 0,0"/></g><g transform="translate(18,30.7949)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.444,0 -13.5,-6.056 -13.5,-13.5 0,-1.9 0.396,-3.751 1.178,-5.499 0.092,-0.202 0.301,-0.317 0.526,-0.291 0.221,0.031 0.394,0.204 0.426,0.425 0.393,2.755 2.581,4.706 4.512,6.428 1.793,1.599 3.497,3.119 3.444,5.041 6.516,-1.171 14.006,-6.017 14.784,-11.469 0.031,-0.221 0.205,-0.394 0.426,-0.425 0.023,-0.003 0.047,-0.005 0.069,-0.005 0.196,0 0.375,0.114 0.456,0.296 0.783,1.748 1.179,3.599 1.179,5.499 C 13.5,-6.056 7.444,0 0,0"/></g><g transform="translate(14,9)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 C 8,0 7,-2 4,-2 1,-2 0,0 0,0"/></g><g transform="translate(16,14)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1 L 0,0 Z"/></g><g transform="translate(22,14)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1 L 0,0 Z"/></g><g transform="translate(18,27)" id="g48"><path id="path50" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.971,0 -9,1.567 -9,3.5 -9,5.433 -4.971,7 0,7 4.971,7 9,5.433 9,3.5 9,1.567 4.971,0 0,0 m 0,9 c -6.627,0 -12,-2.686 -12,-6 0,-3.313 5.373,-6 12,-6 6.627,0 12,2.687 12,6 0,3.314 -5.373,6 -12,6"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M.005 30.093c-.003.014-.004.027-.005.041.001.11.02.215.032.322.009.073.01.15.021.225l.046.2C.715 33.773 4.431 36 8.94 36c4.506 0 8.225-2.227 8.838-5.119.018-.066.035-.131.046-.199.012-.074.015-.151.022-.227.012-.106.031-.211.032-.321 0-.015-.004-.028-.006-.041l.006-.053h-.008c-.051-1.652-1.357-2.979-2.971-2.979-1.617 0-2.923 1.327-2.973 2.979h-.018c.001-.031.009-.061.009-.093 0-1.696-1.334-3.072-2.98-3.072-1.644 0-2.978 1.374-2.98 3.072.001.032.009.062.012.093h-.017c-.051-1.652-1.356-2.979-2.972-2.979-1.615 0-2.921 1.327-2.97 2.979L0 30.039c0 .019.005.036.005.054zm18.084 0c-.004.015-.005.027-.006.041.001.11.02.215.031.322.01.073.011.15.021.225.014.069.031.137.046.2.617 2.892 4.334 5.119 8.841 5.119 4.506 0 8.225-2.227 8.839-5.119.018-.066.035-.131.046-.199.012-.074.016-.151.022-.227.012-.106.03-.211.032-.321 0-.015-.004-.028-.006-.041l.006-.053h-.009c-.051-1.652-1.357-2.979-2.971-2.979-1.616 0-2.923 1.327-2.973 2.979h-.018c.001-.031.009-.061.009-.093 0-1.696-1.334-3.072-2.979-3.072-1.644 0-2.978 1.374-2.979 3.072.002.032.009.062.012.093h-.019c-.051-1.652-1.356-2.979-2.972-2.979-1.615 0-2.921 1.327-2.97 2.979l-.01-.001c.001.019.007.036.007.054z"/><circle fill="#FFDC5D" cx="18" cy="21" r="12"/><path fill="#FFAC33" d="M18 5.205c-7.444 0-13.5 6.056-13.5 13.5 0 1.9.396 3.751 1.178 5.499.091.202.3.317.526.291.221-.031.394-.204.426-.425.393-2.755 2.581-4.706 4.512-6.428 1.793-1.599 3.498-3.119 3.444-5.041 6.516 1.171 14.006 6.017 14.784 11.469.031.221.205.394.426.425.023.003.047.005.069.005.195 0 .375-.114.456-.296.782-1.748 1.179-3.599 1.179-5.499 0-7.444-6.056-13.5-13.5-13.5z"/><path fill="#662113" d="M14 27h8s-1 2-4 2-4-2-4-2zm2-5c0 .553-.448 1-1 1s-1-.447-1-1v-2c0-.553.448-1 1-1s1 .447 1 1v2zm6 0c0 .553-.447 1-1 1-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1 .553 0 1 .447 1 1v2z"/><path fill="#8CCAF7" d="M18 0C11.373 0 6 2.687 6 6s5.373 6 12 6 12-2.686 12-6-5.373-6-12-6zm0 9c-4.971 0-9-1.567-9-3.5S13.029 2 18 2s9 1.567 9 3.5S22.971 9 18 9z"/></svg>
\ No newline at end of file