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/1f923.svg b/public/emoji/1f923.svg
index 1ca89f33a..7ddfcae30 100644
--- a/public/emoji/1f923.svg
+++ b/public/emoji/1f923.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(30.7279,30.7279)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 7.029,-7.029 7.029,-18.427 0,-25.456 -7.029,-7.029 -18.426,-7.029 -25.456,0 -7.029,7.029 -7.029,18.427 0,25.456 7.03,7.029 18.427,7.029 25.456,0"/></g><g transform="translate(19.2791,16.7199)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.494,-3.494 -6.219,-5.404 -9.645,-7.714 -0.78,-0.529 -1.928,-1.929 0.002,-3.858 3.857,-3.857 13.11,-4.247 19.286,1.929 6.178,6.177 5.789,15.43 1.93,19.288 -1.93,1.929 -3.33,0.781 -3.858,0 C 5.406,6.221 3.495,3.494 0,0"/></g><g transform="translate(11.5642,7.0769)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3.858,1.929 9.644,7.716 5.787,5.785 7.715,9.643 7.715,9.643 0,0 1.929,-5.787 -4.821,-12.538 C 5.786,-1.929 0,0 0,0"/></g><g transform="translate(12.5352,20.1901)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.025,-0.239 -0.21,-0.43 -0.447,-0.468 -0.016,-10e-4 -1.619,-0.268 -3.447,-2.096 -1.827,-1.827 -2.094,-3.43 -2.097,-3.445 -0.034,-0.237 -0.226,-0.425 -0.464,-0.449 -0.239,-0.028 -0.467,0.109 -0.554,0.335 -0.056,0.146 -1.345,3.591 0.869,5.805 2.215,2.215 5.66,0.925 5.806,0.869 C -0.112,0.464 0.025,0.238 0,0"/></g><g transform="translate(22.2675,29.9225)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.024,-0.238 -0.208,-0.43 -0.446,-0.468 -0.016,-10e-4 -1.62,-0.268 -3.446,-2.095 -1.828,-1.828 -2.096,-3.432 -2.098,-3.445 -0.034,-0.238 -0.225,-0.424 -0.464,-0.451 -0.239,-0.027 -0.468,0.111 -0.555,0.336 -0.056,0.145 -1.344,3.591 0.871,5.805 2.213,2.214 5.658,0.925 5.804,0.869 C -0.11,0.464 0.027,0.239 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCB4C" d="M30.728 5.272c7.029 7.029 7.029 18.427 0 25.456s-18.426 7.029-25.456 0c-7.029-7.029-7.029-18.427 0-25.456s18.426-7.029 25.456 0"/><path fill="#65471B" d="M19.279 19.28c-3.494 3.494-6.219 5.404-9.645 7.713-.781.529-1.928 1.929.001 3.859 3.857 3.857 13.111 4.247 19.287-1.929 6.177-6.177 5.788-15.43 1.929-19.288-1.929-1.93-3.33-.782-3.858-.001-2.308 3.425-4.219 6.151-7.714 9.646z"/><path fill="#FFF" d="M11.564 28.923s3.858-1.929 9.644-7.716c5.787-5.786 7.715-9.643 7.715-9.643s1.928 5.787-4.822 12.537c-6.75 6.751-12.537 4.822-12.537 4.822z"/><path fill="#65471B" d="M24.299 6.655c-.141.02-2.373.357-4.943 1.628-.062-.101-.132-.198-.219-.285-.261-.261-.595-.399-.936-.427.907-1.643 1.978-2.737 1.998-2.756.388-.39.388-1.024-.003-1.413s-1.022-.39-1.412 0c-.156.156-3.828 3.881-3.828 8.485 0 .405.243.769.617.924.373.155.804.069 1.09-.217 3.245-3.245 7.874-3.953 7.921-3.96.222-.032.416-.135.563-.282.215-.215.33-.526.284-.85-.081-.547-.586-.925-1.132-.847zM11.712 15.13c-4.604 0-8.329 3.672-8.485 3.828-.39.39-.39 1.022 0 1.412.389.391 1.022.392 1.414.003.019-.019 1.113-1.091 2.756-1.997.029.341.166.675.427.936.087.087.184.157.285.219C6.837 22.1 6.5 24.333 6.48 24.474c-.078.547.302 1.053.848 1.131.325.047.634-.068.849-.283.147-.147.25-.342.282-.565.007-.046.698-4.657 3.96-7.919.286-.286.371-.716.217-1.09-.155-.375-.519-.618-.924-.618z"/><path fill="#64AADD" d="M30.101 12.055c2.741.334 5.234-1.618 5.567-4.36.334-2.741-1.617-5.234-4.359-5.568-2.741-.333-10.409 2.763-10.53 3.756-.121.992 6.581 5.837 9.322 6.172zM12.157 29.999c.334 2.741-1.618 5.234-4.36 5.567-2.741.334-5.234-1.617-5.568-4.359-.334-2.742 2.763-10.41 3.756-10.531.992-.12 5.837 6.582 6.172 9.323z"/></svg>
\ No newline at end of file