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/1f450-1f3fe.svg b/public/emoji/1f450-1f3fe.svg
index f15104c53..e31b85caf 100644
--- a/public/emoji/1f450-1f3fe.svg
+++ b/public/emoji/1f450-1f3fe.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(15.2813,15.7422)" id="g20"><path id="path22" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.869,3.661 -3.811,8.11 c -0.285,0.612 -1.147,0.815 -1.924,0.452 l -0.062,-0.028 c -0.68,-0.318 -1.07,-0.964 -0.964,-1.53 0,0 -1.275,1.147 -2.024,0.797 l -0.059,-0.027 c -0.748,-0.35 -1.122,-1.137 -0.832,-1.758 l 0.533,-1.192 c -0.301,0.644 -1.19,0.866 -1.986,0.494 L -13.06,8.95 C -13.855,8.579 -14.257,7.756 -13.957,7.112 L -8.826,-6.038 -2.031,-6.25 0,0 Z"/></g><g transform="translate(33.8525,24.6919)" id="g24"><path id="path26" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.062,0.029 c -0.796,0.372 -1.685,0.15 -1.986,-0.494 l 0.533,1.193 c 0.29,0.621 -0.084,1.407 -0.832,1.757 l -0.059,0.027 c -0.749,0.35 -1.591,0.13 -1.882,-0.491 L -4.431,1.715 c 0.108,0.567 -0.283,1.213 -0.964,1.53 L -5.456,3.273 C -6.233,3.636 -7.095,3.434 -7.38,2.822 l -3.885,-8.111 -1.603,-3.387 2.909,-7.246 6.302,4.318 4.553,9.766 C 1.197,-1.194 0.795,-0.371 0,0"/></g><g transform="translate(35.8086,20.3276)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.653,1.043 -0.454,1.558 -1.561,2.072 -1.937,0.9 -1.937,0.9 l -2.389,-5.142 c -0.141,0.164 -0.705,0.516 -0.866,0.671 l 3.315,7.136 c 0,0 0.653,1.044 -0.455,1.559 -1.107,0.514 -1.483,-0.658 -1.483,-0.658 l -3.119,-6.711 c -0.174,0.099 -0.63,0.327 -0.812,0.424 L -4.13,5.96 c 0,0 0.652,1.043 -0.455,1.557 C -5.691,8.032 -6.067,6.86 -6.067,6.86 l -3.619,-7.779 c -0.193,0.078 -0.796,0.334 -0.988,0.403 l 3.38,7.273 c 0,0 0.651,1.043 -0.455,1.557 -1.108,0.515 -1.483,-0.656 -1.483,-0.656 l -3.575,-7.689 -0.286,-0.617 -0.128,-0.276 c 3.323,-1.544 4.487,-5.617 3.2,-8.384 -0.257,-0.554 -1.176,-0.3 -1.176,-0.3 1.544,3.321 0.358,6.566 -2.964,8.109 l 0.143,4.546 c 0,0 0.134,1.213 -1.079,1.348 -1.215,0.134 -1.348,-1.08 -1.348,-1.08 l -0.509,-3.183 c -0.203,-1.262 -0.431,-2.525 -0.81,-3.746 -1.066,-3.447 0.552,-7.238 3.915,-8.803 3.669,-1.705 8.028,-0.112 9.733,3.556 0.09,0.195 0.257,0.556 0.257,0.556 L 0,0 Z"/></g><g transform="translate(0.1919,20.3276)" id="g32"><path id="path34" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.654,1.043 0.453,1.558 1.561,2.072 1.936,0.9 1.936,0.9 l 2.39,-5.142 c 0.14,0.164 0.705,0.516 0.866,0.671 L 1.877,3.565 c 0,0 -0.654,1.044 0.455,1.559 1.106,0.514 1.482,-0.658 1.482,-0.658 l 3.119,-6.711 c 0.175,0.099 0.63,0.327 0.813,0.424 L 4.129,5.96 c 0,0 -0.652,1.043 0.455,1.557 C 5.691,8.032 6.067,6.86 6.067,6.86 l 3.618,-7.779 c 0.193,0.078 0.797,0.334 0.988,0.403 l -3.38,7.273 c 0,0 -0.651,1.043 0.456,1.557 1.107,0.515 1.483,-0.656 1.483,-0.656 l 3.574,-7.689 0.286,-0.617 0.128,-0.276 c -3.323,-1.544 -4.486,-5.617 -3.2,-8.384 0.258,-0.554 1.177,-0.3 1.177,-0.3 -1.544,3.321 -0.359,6.566 2.963,8.109 l -0.142,4.546 c 0,0 -0.135,1.213 1.078,1.348 1.215,0.134 1.349,-1.08 1.349,-1.08 l 0.508,-3.183 c 0.203,-1.262 0.432,-2.525 0.811,-3.746 1.067,-3.447 -0.552,-7.238 -3.916,-8.803 -3.669,-1.705 -8.027,-0.112 -9.732,3.556 -0.09,0.195 -0.257,0.556 -0.257,0.556 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#90603E" d="M15.281 20.258l-1.869-3.661-3.811-8.11c-.285-.612-1.147-.815-1.924-.452l-.061.028c-.68.317-1.071.963-.964 1.53 0 0-1.275-1.147-2.024-.797l-.06.027c-.749.35-1.123 1.136-.833 1.757l.533 1.192c-.301-.644-1.19-.866-1.985-.494l-.062.029c-.795.371-1.197 1.194-.896 1.838l5.131 13.15 6.794.212 2.031-6.249zm18.572-8.95l-.062-.029c-.796-.372-1.685-.15-1.985.494l.533-1.192c.29-.621-.084-1.408-.832-1.757l-.06-.027c-.749-.35-1.591-.129-1.882.492l-.143.306c.107-.567-.283-1.213-.964-1.53l-.062-.028c-.777-.363-1.639-.16-1.924.452l-3.885 8.11-1.604 3.388 2.909 7.246 6.302-4.318 4.554-9.766c.302-.647-.101-1.47-.895-1.841z"/><path fill="#AF7E57" d="M35.809 15.672s.653-1.043-.454-1.558c-1.106-.515-1.482.657-1.482.657l-2.39 5.142c-.141-.164-.705-.516-.866-.671l3.315-7.136s.653-1.043-.455-1.558c-1.107-.514-1.483.657-1.483.657l-3.118 6.711c-.175-.099-.63-.327-.812-.423l3.616-7.781s.652-1.043-.455-1.558c-1.106-.515-1.482.657-1.482.657l-3.618 7.78c-.193-.078-.797-.335-.988-.404l3.38-7.272s.651-1.043-.455-1.558c-1.108-.515-1.483.657-1.483.657l-3.574 7.689-.286.617-.128.276c3.323 1.544 4.486 5.616 3.2 8.384-.258.554-1.177.3-1.177.3 1.544-3.321.358-6.566-2.964-8.109l.144-4.545s.134-1.213-1.079-1.348c-1.215-.134-1.349 1.08-1.349 1.08l-.509 3.183c-.203 1.262-.431 2.525-.81 3.746-1.066 3.447.551 7.238 3.915 8.803 3.669 1.705 8.027.112 9.732-3.556l.257-.556 3.858-8.306z"/><path fill="#AF7E57" d="M.192 15.672s-.654-1.043.453-1.558c1.107-.515 1.482.657 1.482.657l2.39 5.142c.141-.164.705-.516.866-.671l-3.315-7.136s-.654-1.043.455-1.558c1.105-.514 1.482.657 1.482.657l3.119 6.711c.175-.099.63-.327.812-.423l-3.615-7.78s-.653-1.043.455-1.558c1.107-.515 1.483.657 1.483.657l3.618 7.78c.193-.078.797-.335.988-.404l-3.38-7.272s-.651-1.043.455-1.558c1.107-.515 1.483.657 1.483.657l3.574 7.689.286.617.128.276c-3.323 1.544-4.486 5.616-3.2 8.384.258.554 1.177.3 1.177.3-1.544-3.321-.358-6.566 2.963-8.109l-.143-4.545s-.134-1.213 1.078-1.348c1.215-.134 1.35 1.08 1.35 1.08l.508 3.183c.203 1.262.432 2.525.811 3.746 1.067 3.447-.552 7.238-3.916 8.803-3.669 1.705-8.027.112-9.732-3.556l-.256-.556-3.859-8.307z"/></svg>
\ No newline at end of file