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/1f33b.svg b/public/emoji/1f33b.svg
index b39eabf1c..413e6fcbf 100644
--- a/public/emoji/1f33b.svg
+++ b/public/emoji/1f33b.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(28,9)" id="g20"><path id="path22" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -8,0 -8,-6 -8,-6 l 0,11 -4,0 0,-11 c 0,0 0,6 -8,6 -4,0 -7,2 -7,2 0,0 0,-9 9,-9 l 6,0 c 0,0 0,-2 2,-2 2,0 2,2 2,2 l 6,0 C 7,-7 7,2 7,2 7,2 4,0 0,0"/></g><g transform="translate(21.125,8.3379)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.328,0 -0.651,0.097 -0.927,0.283 L -3.25,1.858 -5.572,0.283 C -5.849,0.097 -6.173,0 -6.501,0 -6.645,0 -6.788,0.018 -6.93,0.057 -7.392,0.18 -7.78,0.498 -7.99,0.931 L -9.214,3.458 -12.012,3.254 C -12.051,3.252 -12.091,3.25 -12.13,3.25 c -0.438,0 -0.86,0.174 -1.17,0.484 -0.34,0.342 -0.516,0.811 -0.482,1.288 l 0.201,2.8 -2.523,1.225 c -0.432,0.209 -0.751,0.598 -0.875,1.061 -0.125,0.464 -0.042,0.958 0.228,1.356 l 1.573,2.323 -1.573,2.322 c -0.27,0.398 -0.353,0.893 -0.228,1.358 0.124,0.462 0.443,0.85 0.875,1.06 l 2.523,1.224 -0.201,2.798 c -0.034,0.48 0.142,0.95 0.482,1.288 0.309,0.312 0.732,0.485 1.17,0.485 0.039,0 0.079,0 0.118,-0.003 l 2.798,-0.201 1.224,2.523 c 0.21,0.432 0.598,0.751 1.06,0.876 0.142,0.037 0.285,0.057 0.429,0.057 0.328,0 0.651,-0.098 0.929,-0.285 l 2.322,-1.574 2.323,1.574 c 0.276,0.187 0.599,0.285 0.927,0.285 0.144,0 0.29,-0.02 0.428,-0.057 0.465,-0.125 0.853,-0.444 1.062,-0.876 l 1.225,-2.523 2.8,0.201 c 0.037,0.003 0.078,0.003 0.116,0.003 0.437,0 0.858,-0.173 1.172,-0.485 0.338,-0.338 0.514,-0.808 0.48,-1.288 L 7.079,19.751 9.606,18.527 c 0.433,-0.21 0.751,-0.598 0.874,-1.06 0.125,-0.465 0.043,-0.96 -0.226,-1.358 L 8.679,13.787 10.254,11.464 C 10.523,11.066 10.605,10.572 10.48,10.108 10.357,9.645 10.039,9.256 9.606,9.047 L 7.079,7.822 7.283,5.022 C 7.317,4.545 7.141,4.076 6.803,3.734 6.489,3.424 6.068,3.25 5.631,3.25 5.593,3.25 5.552,3.252 5.515,3.254 L 2.715,3.458 1.49,0.931 C 1.281,0.498 0.893,0.18 0.428,0.057 0.289,0.018 0.144,0 0,0"/></g><g transform="translate(25,22)" id="g28"><path id="path30" style="fill:#732700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,3.866 -3.135,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.865,0 7,3.134 7,7"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3E721D" d="M28 27c-8 0-8 6-8 6V22h-4v11s0-6-8-6c-4 0-7-2-7-2s0 9 9 9h6s0 2 2 2 2-2 2-2h6c9 0 9-9 9-9s-3 2-7 2z"/><path fill="#FFAC33" d="M21.125 27.662c-.328 0-.651-.097-.927-.283l-2.323-1.575-2.322 1.575c-.277.186-.601.283-.929.283-.143 0-.287-.018-.429-.057-.462-.123-.851-.441-1.06-.874l-1.225-2.527-2.797.204c-.04.002-.079.004-.119.004-.438 0-.86-.174-1.17-.484-.34-.342-.516-.81-.481-1.288l.201-2.8-2.523-1.225c-.432-.209-.751-.598-.876-1.062-.125-.464-.042-.958.228-1.356l1.573-2.323-1.573-2.322c-.27-.398-.353-.892-.228-1.357.125-.462.444-.851.876-1.06L7.544 7.91l-.201-2.797c-.034-.48.142-.951.481-1.289.31-.312.732-.485 1.17-.485.04 0 .079 0 .119.003l2.797.201 1.225-2.523c.209-.432.598-.751 1.06-.876.142-.038.285-.057.429-.057.328 0 .651.098.929.285l2.322 1.573L20.198.372c.275-.188.599-.285.927-.285.144 0 .29.02.428.057.465.125.854.444 1.062.876l1.225 2.523 2.8-.201c.037-.003.078-.003.116-.003.438 0 .858.173 1.172.485.338.338.515.809.48 1.289l-.204 2.797 2.527 1.225c.433.209.751.598.874 1.06.124.465.043.96-.227 1.357l-1.575 2.322 1.575 2.323c.269.398.351.892.227 1.356-.123.464-.441.852-.874 1.062l-2.527 1.225.204 2.8c.034.478-.143.946-.48 1.288-.313.311-.734.484-1.172.484-.038 0-.079-.002-.116-.004l-2.8-.204-1.225 2.527c-.209.433-.598.751-1.062.874-.139.04-.284.057-.428.057z"/><circle fill="#732700" cx="18" cy="14" r="7"/></svg>
\ No newline at end of file