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/1f968.svg b/public/emoji/1f968.svg
index 7aaef3251..10bd682b6 100644
--- a/public/emoji/1f968.svg
+++ b/public/emoji/1f968.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="m 7.79102,13.2363 5.07328,0 0,-5.3613 -5.07328,0 0,5.3613 z"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" d="m 23.4385,13.6699 5.3779,0 0,-5.9795 -5.3779,0 0,5.9795 z"/></clipPath><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" d="m 18.0029,17.3691 4.0782,0 0,-2.8232 -4.0782,0 0,2.8232 z"/></clipPath><clipPath id="clipPath76" clipPathUnits="userSpaceOnUse"><path id="path78" d="m 18.002,25.8931 4.5322,0 0,-2.6045 -4.5322,0 0,2.6045 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(27.7852,16.0596)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.311,-0.431 -0.665,-0.812 -1.04,-1.167 -1.274,0.985 -2.839,1.789 -4.745,2.107 -0.341,0.057 -0.654,0.126 -0.95,0.202 1.372,1.525 1.95,3.322 1.95,4.798 0,1.502 -0.314,2.816 -0.861,3.941 0.285,0.036 0.573,0.059 0.861,0.059 1.15,0 4.947,0.159 6,-3 C 2.011,4.553 1.625,2.254 0,0 m -9.785,-4.06 c -2.297,0 -4.476,0.394 -6.324,1.266 0.657,0.372 1.415,0.643 2.324,0.734 1.565,0.158 2.885,0.525 4,1.025 1.115,-0.5 2.435,-0.867 4,-1.025 0.909,-0.091 1.667,-0.362 2.324,-0.734 C -5.31,-3.666 -7.489,-4.06 -9.785,-4.06 M -19.57,0 c -1.625,2.254 -2.011,4.553 -1.215,6.94 1.053,3.159 4.849,3 6,3 0.288,0 0.575,-0.023 0.861,-0.059 -0.548,-1.125 -0.861,-2.439 -0.861,-3.941 0,-1.476 0.578,-3.273 1.95,-4.798 -0.297,-0.076 -0.609,-0.145 -0.95,-0.202 -1.907,-0.318 -3.471,-1.122 -4.745,-2.107 -0.375,0.355 -0.73,0.736 -1.04,1.167 m 9.785,2.733 c -1.422,1.471 -1,3.207 -1,3.207 0,0.708 0.381,1.415 1,2.034 0.619,-0.619 1,-1.326 1,-2.034 0,0 0.422,-1.736 -1,-3.207 m 17,1.207 c 0,8 -6,11 -12,11 -1.738,0 -3.472,-0.371 -5,-1.096 -1.529,0.725 -3.262,1.096 -5,1.096 -6,0 -12,-3 -12,-11 0,-3 1.314,-5.662 3,-8 0.433,-0.601 0.903,-1.146 1.4,-1.647 -0.357,-0.603 -0.617,-1.091 -0.779,-1.353 -0.621,-1 0.379,-2 1.379,-2 0.69,0 1.205,0.618 1.745,1.483 2.807,-1.756 6.277,-2.483 10.255,-2.483 3.977,0 7.448,0.727 10.255,2.483 0.54,-0.865 1.055,-1.483 1.745,-1.483 1,0 2,1 1.379,2 -0.163,0.262 -0.422,0.75 -0.78,1.353 0.497,0.501 0.967,1.046 1.401,1.647 1.685,2.338 3,5 3,8"/></g><g id="g24"><g id="g26"/><g id="g32"><g style="opacity:0.5" id="g34" clip-path="url(#clipPath28)"><g id="g36" transform="translate(11.751,13.2363)"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.794,-0.448 -1.78,-1.172 -2.376,-2.236 -3.064,-3.465 -3.594,-4.27 -3.96,-4.78 c 0.335,-0.207 0.679,-0.403 1.032,-0.581 0.353,0.692 0.878,1.653 1.552,2.687 0.768,1.179 1.902,1.912 2.489,2.238 C 0.732,-0.305 0.357,-0.166 0,0"/></g></g></g></g><g id="g40"><g id="g42"/><g id="g48"><g style="opacity:0.5" id="g50" clip-path="url(#clipPath44)"><g id="g52" transform="translate(23.4434,13.6699)"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.005,-0.002 c 0.314,-0.114 0.611,-0.247 0.886,-0.402 -0.191,-0.09 -0.4,-0.154 -0.597,-0.234 0.565,-0.415 1.348,-1.092 1.96,-2.032 0.74,-1.136 1.377,-2.218 1.797,-2.952 0.26,0.14 0.52,0.278 0.77,0.435 0.188,-0.3 0.373,-0.568 0.562,-0.793 0,0 -0.562,0.793 -2.004,3.31 C 1.927,-0.152 0,0 0,0"/></g></g></g></g><g id="g56"><g id="g58"/><g id="g64"><g style="opacity:0.5" id="g66" clip-path="url(#clipPath60)"><g id="g68" transform="translate(21.0498,17.2012)"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.05,0.055 0.09,0.112 0.138,0.168 -0.569,-0.444 -1.34,-1.055 -2.024,-1.622 -0.357,-0.297 -0.762,-0.531 -1.161,-0.724 0.401,-0.179 0.839,-0.335 1.296,-0.477 0.523,0.293 1.157,0.698 1.701,1.204 0.561,0.52 0.892,0.92 1.081,1.23 C 1.003,-0.216 0.979,-0.206 0.95,-0.201 0.609,-0.145 0.297,-0.075 0,0"/></g></g></g></g><g id="g72"><g id="g74"/><g id="g80"><g style="opacity:0.5" id="g82" clip-path="url(#clipPath76)"><g id="g84" transform="translate(18.5835,23.2886)"><path id="path86" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.732,0.612 2.127,1.524 3.951,1.669 3.841,1.994 3.717,2.307 3.575,2.604 2.992,2.514 2.19,2.355 1.417,2.086 0.54,1.781 -0.164,1.172 -0.581,0.743 -0.346,0.507 -0.159,0.256 0,0"/></g></g></g></g><g transform="translate(13,29)" id="g88"><path id="path90" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(23,28)" id="g92"><path id="path94" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(20,27)" id="g96"><path id="path98" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(4,22)" id="g100"><path id="path102" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(7,25)" id="g104"><path id="path106" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(32,19)" id="g108"><path id="path110" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(32,27)" id="g112"><path id="path114" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(15,9)" id="g116"><path id="path118" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(22,10)" id="g120"><path id="path122" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(26,9)" id="g124"><path id="path126" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(8,14)" id="g128"><path id="path130" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M35 16c0-8-6-11-12-11-1.738 0-3.472.371-5 1.097C16.472 5.371 14.738 5 13 5 7 5 1 8 1 16c0 3 1.314 5.662 3 8 .434.602.903 1.146 1.4 1.647-.357.603-.616 1.091-.779 1.353C4 28 5 29 6 29c.69 0 1.205-.617 1.745-1.482C10.552 29.273 14.023 30 18 30s7.448-.727 10.255-2.482C28.795 28.383 29.31 29 30 29c1 0 2-1 1.379-2-.163-.262-.422-.75-.779-1.353.497-.501.967-1.046 1.4-1.647 1.686-2.338 3-5 3-8zm-17 1.207C16.578 15.736 17 14 17 14c0-.708.381-1.414 1-2.034.619.62 1 1.326 1 2.034 0 0 .422 1.736-1 3.207zM8.215 19.94C6.59 17.687 6.204 15.388 7 13c1.053-3.158 4.85-3 6-3 .288 0 .576.024.861.059C13.314 11.185 13 12.498 13 14c0 1.476.578 3.273 1.951 4.799-.298.075-.61.144-.951.201-1.907.318-3.471 1.122-4.745 2.107-.375-.355-.73-.736-1.04-1.167zM18 24c-2.296 0-4.476-.394-6.324-1.266.657-.372 1.415-.642 2.324-.734 1.565-.157 2.885-.524 4-1.024 1.115.5 2.435.867 4 1.024.909.092 1.667.362 2.324.734C22.476 23.606 20.296 24 18 24zm9.785-4.06c-.311.431-.665.812-1.04 1.167C25.471 20.122 23.906 19.318 22 19c-.341-.057-.653-.126-.95-.201C22.422 17.273 23 15.476 23 14c0-1.502-.313-2.815-.861-3.941.285-.035.573-.059.861-.059 1.15 0 4.947-.158 6 3 .796 2.388.41 4.687-1.215 6.94z"/><path fill="#AD5810" d="M11.751 22.764c-.794.448-1.78 1.172-2.376 2.236-.688 1.229-1.218 2.033-1.584 2.544.335.207.679.402 1.032.581.353-.692.878-1.653 1.552-2.688.768-1.179 1.902-1.912 2.489-2.238-.381-.131-.756-.269-1.113-.435zm11.692-.434l-.005.002c.314.114.611.247.886.402-.19.09-.399.153-.597.233.564.415 1.348 1.092 1.96 2.032.74 1.136 1.377 2.218 1.797 2.952.26-.14.521-.278.771-.435.188.3.372.567.562.792 0 0-.562-.792-2.004-3.31s-3.37-2.668-3.37-2.668zm-2.393-3.531c.05-.055.09-.112.138-.168-.568.444-1.34 1.055-2.023 1.622-.358.297-.763.531-1.161.724.401.18.839.335 1.296.477.524-.293 1.157-.698 1.701-1.204.56-.521.892-.92 1.081-1.23-.029-.005-.054-.015-.082-.02-.341-.057-.653-.126-.95-.201zm-2.467-6.088c.732-.612 2.127-1.524 3.951-1.669-.109-.324-.233-.637-.376-.935-.583.091-1.385.249-2.158.518-.877.305-1.58.914-1.998 1.344.235.236.423.486.581.742z"/><g fill="#FFE8B6"><circle cx="7" cy="22" r="1"/><circle cx="3" cy="14" r="1"/><circle cx="6" cy="11" r="1"/><circle cx="12" cy="7" r="1"/><circle cx="14" cy="27" r="1"/><circle cx="21" cy="26" r="1"/><circle cx="25" cy="27" r="1"/><circle cx="31" cy="17" r="1"/><circle cx="31" cy="9" r="1"/><circle cx="22" cy="8" r="1"/><circle cx="19" cy="9" r="1"/></g></svg>
\ No newline at end of file