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/1f922.svg b/public/emoji/1f922.svg
index 1815d4965..ed7c86c0d 100644
--- a/public/emoji/1f922.svg
+++ b/public/emoji/1f922.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(35.9895,18)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(14.6068,11.0258)" id="g24"><path id="path26" style="fill:none;stroke:#292f33;stroke-width:2.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 0.903,0.595 2.064,0.953 3.331,0.953 1.258,0 2.411,-0.352 3.311,-0.939"/></g><g transform="translate(28.0283,22.9639)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.244,0.3 -6.771,1.502 -6.826,1.502 -0.118,0 -0.251,-0.088 -0.276,-0.204 -0.217,-1.027 -0.051,-2.071 0.466,-2.941 0.522,-0.876 1.337,-1.47 2.296,-1.673 0.233,-0.049 0.471,-0.074 0.707,-0.074 1.746,0 3.296,1.336 3.686,3.178 C 0.067,-0.139 0.048,-0.058 0,0"/></g><g transform="translate(14.7563,24.4663)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.056,0 -6.583,-1.202 -6.827,-1.502 -0.048,-0.059 -0.068,-0.14 -0.052,-0.214 0.389,-1.84 1.94,-3.176 3.686,-3.176 0.236,0 0.474,0.025 0.707,0.074 1.972,0.416 3.211,2.486 2.762,4.613 C 0.252,-0.089 0.119,0 0,0"/></g><g transform="translate(11.6471,6.3529)" id="g36"><path id="path38" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.444,0 -0.857,0.28 -1.005,0.724 -0.185,0.555 0.115,1.155 0.67,1.339 0.095,0.033 2.453,0.877 2.453,3.231 0,2.355 -2.358,3.198 -2.459,3.232 -0.55,0.192 -0.846,0.791 -0.658,1.343 0.187,0.552 0.78,0.852 1.334,0.664 0.159,-0.052 3.9,-1.344 3.9,-5.239 0,-3.895 -3.741,-5.186 -3.9,-5.239 C 0.224,0.018 0.111,0 0,0"/></g><g transform="translate(24.3519,6.3529)" id="g40"><path id="path42" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.111,0 -0.223,0.018 -0.334,0.055 -0.159,0.053 -3.9,1.344 -3.9,5.239 0,3.895 3.741,5.187 3.9,5.239 C 0.225,10.72 0.82,10.419 1.005,9.864 1.19,9.311 0.892,8.714 0.341,8.526 0.241,8.492 -2.117,7.649 -2.117,5.294 -2.117,2.94 0.241,2.096 0.341,2.062 0.892,1.871 1.188,1.271 1.001,0.72 0.851,0.278 0.44,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M35.99 18c0 9.941-8.059 18-18 18-9.94 0-18-8.059-18-18 0-9.94 8.06-18 18-18s18 8.06 18 18"/><path fill="#292F33" d="M15.364 26.122l-1.515-2.295c1.154-.762 2.606-1.182 4.089-1.182 1.49 0 2.895.402 4.062 1.162l-1.502 2.305c-1.425-.928-3.721-.924-5.134.01zm12.664-13.086c-.244-.3-6.771-1.502-6.826-1.502-.118 0-.251.089-.275.205-.218 1.027-.052 2.071.466 2.941.521.876 1.337 1.47 2.296 1.673.232.049.471.074.707.074 1.746 0 3.296-1.336 3.686-3.177.014-.075-.006-.156-.054-.214zm-13.272-1.502c-.056 0-6.583 1.202-6.827 1.502-.048.059-.068.14-.052.213.389 1.84 1.939 3.176 3.686 3.176.236 0 .474-.025.707-.074 1.972-.417 3.211-2.486 2.762-4.613-.024-.115-.157-.204-.276-.204z"/><path fill="#3E721D" d="M11.647 29.647c-.444 0-.857-.28-1.005-.724-.185-.555.115-1.155.669-1.339.095-.033 2.453-.877 2.453-3.231s-2.358-3.198-2.458-3.232c-.55-.191-.846-.791-.659-1.342.187-.552.78-.852 1.334-.665.159.053 3.9 1.344 3.9 5.239s-3.741 5.187-3.9 5.239c-.11.037-.223.055-.334.055zm12.705 0c-.111 0-.223-.018-.334-.055-.159-.053-3.9-1.344-3.9-5.239s3.741-5.187 3.9-5.239c.559-.187 1.154.115 1.339.669.185.553-.113 1.151-.664 1.338-.1.034-2.458.878-2.458 3.232s2.358 3.198 2.458 3.232c.551.191.847.791.66 1.342-.15.442-.561.72-1.001.72z"/></svg>
\ No newline at end of file