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/1f9d8-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f9d8-1f3fc-200d-2642-fe0f.svg
index 426c5de95..5c4a81ada 100644
--- a/public/emoji/1f9d8-1f3fc-200d-2642-fe0f.svg
+++ b/public/emoji/1f9d8-1f3fc-200d-2642-fe0f.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(11.5613,11.1936)" id="g20"><path id="path22" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.741,-3.048 c -0.607,-0.323 -1.368,-0.09 -1.69,0.517 l 0,0 c -0.322,0.608 -0.09,1.368 0.518,1.691 l 5.741,3.048 C -0.565,2.53 0.195,2.297 0.518,1.69 l 0,0 C 0.84,1.083 0.607,0.322 0,0"/></g><g transform="translate(13.4797,18.5065)" id="g24"><path id="path26" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.266,-6.375 C -1.4,-7.05 -2.061,-7.492 -2.736,-7.358 l 0,0 c -0.674,0.134 -1.116,0.795 -0.982,1.47 l 1.266,6.375 c 0.134,0.674 0.795,1.116 1.469,0.983 l 0,0 C -0.308,1.336 0.134,0.674 0,0"/></g><g transform="translate(24.4387,11.1936)" id="g28"><path id="path30" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.741,-3.048 c 0.607,-0.323 1.368,-0.09 1.69,0.517 l 0,0 c 0.323,0.608 0.09,1.368 -0.518,1.691 L 1.172,2.208 C 0.565,2.53 -0.195,2.297 -0.518,1.69 l 0,0 C -0.84,1.083 -0.607,0.322 0,0"/></g><g transform="translate(22.5204,18.5065)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.266,-6.375 C 1.4,-7.05 2.061,-7.492 2.736,-7.358 l 0,0 c 0.674,0.134 1.116,0.795 0.982,1.47 L 2.452,0.487 C 2.318,1.161 1.657,1.603 0.983,1.47 l 0,0 C 0.308,1.336 -0.134,0.674 0,0"/></g><g transform="translate(22.9991,4.25)" id="g36"><path id="path38" style="fill:#4289b1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-1.25 -5,-1.25 -5,0 -5,1.25 -5,1.25 l 0,5.5 10,0 L 0,0 Z"/></g><g transform="translate(22.9992,21)" id="g40"><path id="path42" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,0 -2,0 -3,0 c -2.563,0 -2.458,-4 -2.458,-4 l 2.458,0 0,-9 5,0 5,0 0,9 2.458,0 c 0,0 0.105,4 -2.458,4"/></g><g transform="translate(15.667,25.6111)" id="g44"><path id="path46" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4.666 c 0,-0.312 1.045,-1.093 2.333,-1.093 1.288,0 2.333,0.819 2.333,1.093 L 4.666,0 0,0 Z"/></g><g transform="translate(22.954,32.0342)" id="g48"><path id="path50" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.908,0 0,-5.432 0,-10e-4 c 0,-2.737 2.218,-4.953 4.954,-4.953 2.736,0 4.954,2.216 4.954,4.953 L 0,-5.432 0,0 Z"/></g><g transform="translate(19.9816,23.9426)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.982,0 -1.981,0 c 0,0 0,-0.991 1.981,-0.991 C 0,-0.991 0,0 0,0"/></g><g transform="translate(15.9954,27.5)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.274 -0.222,-0.495 -0.495,-0.495 -0.274,0 -0.496,0.221 -0.496,0.495 0,0.274 0.222,0.495 0.496,0.495 C -0.222,0.495 0,0.274 0,0"/></g><g transform="translate(20.9954,27.5)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.274 -0.222,-0.495 -0.495,-0.495 -0.274,0 -0.496,0.221 -0.496,0.495 0,0.274 0.222,0.495 0.496,0.495 C -0.222,0.495 0,0.274 0,0"/></g><g transform="translate(17.0092,25.9243)" id="g64"><path id="path66" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.991,0 0.991,0 c 0,0 0,-0.991 -0.991,-0.991 C 0,-0.991 0,0 0,0"/></g><g transform="translate(18.0002,35.0474)" id="g68"><path id="path70" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.385,0 5.5,-2.579 5.5,-4.728 0,-2.149 -0.423,-3.009 -0.846,-2.149 -0.423,0.86 -0.847,1.719 -0.847,1.719 0,0 -2.538,0 -3.384,0.86 0,0 1.269,-2.579 -1.269,0 0,0 0.423,-1.719 -2.115,0.43 0,0 -1.27,-0.86 -1.693,-3.009 -0.117,-0.596 -0.846,0 -0.846,2.149 C -5.5,-2.579 -3.808,0 0,0"/></g><g transform="translate(26.5872,6.946)" id="g72"><path id="path74" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.533,0.374 -2.532,0.349 -0.23,0.03 -0.469,0.016 -0.705,-0.052 l -12.977,-3.721 c -0.925,-0.265 -1.465,-1.24 -1.2,-2.165 0.266,-0.925 1.24,-1.465 2.165,-1.199 l 11.942,3.424 c 0.883,0.253 1.988,0.044 2.826,0.061 0.838,0.017 1.631,0.478 1.765,1.431 C 1.418,-0.919 0.953,-0.134 0,0"/></g><g transform="translate(27.1356,4.5977)" id="g76"><path id="path78" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.196,0.694 -2.206,0.474 -2.644,0.365 -0.437,-0.11 -12.556,-3.552 -13.547,-3.844 -0.93,-0.275 -0.388,-1.051 0.063,-1.028 0.034,0.007 0.067,0.008 0.1,0.018 l 11.942,3.424 c 0.883,0.254 1.99,0.003 2.826,0.061 0.396,0.028 0.806,0.148 0.881,0.181 C -0.211,-0.751 0.14,-0.494 0,0"/></g><g transform="translate(9.4128,6.946)" id="g80"><path id="path82" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.533,0.374 2.532,0.349 0.23,0.03 0.469,0.016 0.705,-0.052 l 12.977,-3.721 c 0.925,-0.265 1.465,-1.24 1.2,-2.165 -0.266,-0.925 -1.24,-1.465 -2.165,-1.199 L 3.307,-3.364 C 2.424,-3.111 1.319,-3.32 0.481,-3.303 -0.357,-3.286 -1.15,-2.825 -1.284,-1.872 -1.418,-0.919 -0.953,-0.134 0,0"/></g><g transform="translate(8.8644,4.5977)" id="g84"><path id="path86" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.196,0.694 2.206,0.474 2.644,0.365 0.437,-0.11 12.556,-3.552 13.547,-3.844 0.93,-0.275 0.388,-1.051 -0.063,-1.028 -0.034,0.007 -0.067,0.008 -0.1,0.018 L 4.086,-1.065 C 3.203,-0.811 2.096,-1.062 1.26,-1.004 0.864,-0.976 0.454,-0.856 0.379,-0.823 0.211,-0.751 -0.14,-0.494 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><g fill="#F3D2A2"><path d="M11.561 24.806L5.82 27.855c-.607.322-1.368.089-1.69-.518-.322-.607-.089-1.368.518-1.69l5.741-3.048c.607-.322 1.368-.089 1.69.518.322.606.089 1.367-.518 1.689z"/><path d="M13.48 17.493l-1.266 6.375c-.134.674-.795 1.116-1.47.983-.674-.134-1.116-.795-.983-1.47l1.266-6.375c.134-.674.795-1.116 1.47-.983.674.135 1.117.796.983 1.47z"/></g><g fill="#F3D2A2"><path d="M24.439 24.806l5.741 3.048c.607.322 1.368.089 1.69-.518.322-.607.089-1.368-.518-1.69l-5.741-3.048c-.607-.322-1.368-.089-1.69.518-.322.607-.089 1.368.518 1.69z"/><path d="M22.52 17.493l1.266 6.375c.134.674.795 1.116 1.47.983.674-.134 1.116-.795.983-1.47l-1.266-6.375c-.134-.674-.795-1.116-1.47-.983-.674.135-1.117.796-.983 1.47z"/></g><path fill="#4289B1" d="M22.999 31.75s0 1.25-5 1.25-5-1.25-5-1.25v-5.5h10v5.5z"/><path fill="#77B255" d="M22.999 15h-10c-2.562 0-2.458 4-2.458 4h2.458v9h10v-9h2.458s.105-4-2.458-4z"/><path fill="#F3D2A2" d="M15.667 10.389v4.666c0 .312 1.045 1.093 2.333 1.093 1.288 0 2.333-.819 2.333-1.093v-4.666h-4.666z"/><path fill="#F3D2A2" d="M22.954 3.966h-9.908v5.433c0 2.737 2.218 4.954 4.954 4.954 2.736 0 4.954-2.217 4.954-4.954V3.966z"/><path fill="#C1694F" d="M19.982 12.057h-3.964s0 .991 1.982.991 1.982-.991 1.982-.991z"/><circle fill="#662113" cx="15.5" cy="8.5" r=".495"/><circle fill="#662113" cx="20.5" cy="8.5" r=".495"/><path fill="#C1694F" d="M17.009 10.076h1.982s0 .991-.991.991-.991-.991-.991-.991z"/><path fill="#FFE51E" d="M18 .953c3.385 0 5.5 2.579 5.5 4.728 0 2.149-.423 3.009-.846 2.149l-.846-1.719s-2.538 0-3.384-.86c0 0 1.269 2.579-1.269 0 0 0 .423 1.72-2.115-.429 0 0-1.269.86-1.692 3.008-.117.597-.846 0-.846-2.149C12.5 3.532 14.192.953 18 .953"/><path fill="#F3D2A2" d="M26.587 29.054s-1.533-.374-2.532-.349c-.23-.03-.469-.016-.706.051l-12.977 3.721c-.925.265-1.465 1.239-1.2 2.165.265.925 1.239 1.465 2.165 1.2l11.942-3.425c.883-.253 1.988-.044 2.826-.061.838-.017 1.632-.478 1.766-1.431.134-.953-.331-1.737-1.284-1.871z"/><path fill="#E2C196" d="M27.136 31.402c-.196-.694-2.206-.474-2.644-.365s-12.556 3.551-13.547 3.844c-.93.275-.388 1.051.063 1.028.033-.007.066-.008.1-.018l11.942-3.425c.883-.253 1.99-.003 2.826-.061.397-.027.806-.148.881-.181.168-.071.518-.328.379-.822z"/><path fill="#F3D2A2" d="M9.413 29.054s1.533-.374 2.532-.349c.23-.03.469-.016.706.051l12.977 3.721c.925.265 1.465 1.239 1.2 2.165-.265.925-1.239 1.465-2.165 1.2L12.72 32.418c-.883-.253-1.988-.044-2.826-.061-.838-.017-1.632-.478-1.766-1.431-.133-.954.332-1.738 1.285-1.872z"/><path fill="#E2C196" d="M8.864 31.402c.196-.694 2.206-.474 2.644-.365s12.556 3.551 13.547 3.844c.93.275.388 1.051-.063 1.028-.033-.007-.066-.008-.1-.018L12.95 32.467c-.883-.253-1.99-.003-2.826-.061-.397-.027-.806-.148-.881-.181-.168-.072-.518-.329-.379-.823z"/></svg>
\ No newline at end of file