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/1f1e7-1f1f3.svg b/public/emoji/1f1e7-1f1f3.svg
index 669fd4045..3c20edb28 100644
--- a/public/emoji/1f1e7-1f1f3.svg
+++ b/public/emoji/1f1e7-1f1f3.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(36,9)" id="g20"><path id="path22" style="fill:#f7e017;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(36,9)" id="g24"><path id="path26" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -36,8 0,5 L 0,5 0,0 Z"/></g><g transform="translate(36,14)" id="g28"><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -36,8 0,5 L 0,5 0,0 Z"/></g><g transform="translate(21.5957,21.0649)" id="g32"><path id="path34" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.443,-0.688 0.699,-1.507 0.699,-2.386 0,-2.441 -1.977,-4.419 -4.418,-4.419 -2.44,0 -4.418,1.978 -4.418,4.419 0,0.879 0.257,1.698 0.698,2.386 -0.838,-0.905 -1.351,-2.116 -1.351,-3.447 0,-2.8 2.27,-5.071 5.071,-5.071 2.801,0 5.071,2.271 5.071,5.071 C 1.352,-2.116 0.839,-0.905 0,0"/></g><g transform="translate(9.7808,20.4937)" id="g36"><path id="path38" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.537,-0.118 0.656,-0.323 0.629,-0.758 0,0 0.273,-0.053 0.463,-0.325 C 1.283,-1.354 1.459,-1.626 1.786,-1.734 2.112,-1.843 2.37,-2.06 2.37,-2.712 l 0,-2.42 c 0,0 -0.06,-0.246 0.076,-0.571 0.136,-0.327 0.058,-0.789 -0.947,-0.789 -1.007,0 -1.013,0.436 -0.877,0.761 0.136,0.326 0.294,0.599 0.294,0.599 l 0,2.08 c 0,0 -0.197,0.285 -0.468,0.475 -0.272,0.191 -0.846,0.87 -0.927,1.523 C -0.562,-0.401 -0.714,0.156 0,0"/></g><g transform="translate(25.96,20.4937)" id="g40"><path id="path42" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.537,-0.118 -0.656,-0.323 -0.629,-0.758 0,0 -0.273,-0.053 -0.464,-0.325 -0.19,-0.271 -0.267,-0.543 -0.594,-0.651 -0.326,-0.109 -0.485,-0.326 -0.485,-0.978 l 0,-2.42 c 0,0 -0.039,-0.246 -0.176,-0.571 -0.135,-0.327 -0.107,-0.789 0.899,-0.789 1.006,0 1.087,0.436 0.951,0.761 -0.136,0.326 -0.219,0.599 -0.219,0.599 l 0,2.08 c 0,0 0.097,0.285 0.368,0.475 0.273,0.191 0.796,0.87 0.878,1.523 C 0.611,-0.401 0.713,0.156 0,0"/></g><g transform="translate(23.4355,11.2617)" id="g44"><path id="path46" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.325,0.652 -0.028,0.788 -0.354,0.136 -1.061,0 -1.061,0 0,0 0.589,0.747 0.027,1.061 C -1.624,2.162 -2.01,1.387 -2.502,1.033 -2.993,0.68 -3.488,0.484 -4.088,0.285 -4.686,0.086 -5.466,0 -5.466,0 c 0,0 -0.875,0.086 -1.473,0.285 -0.599,0.199 -1.189,0.395 -1.681,0.748 -0.491,0.354 -0.877,1.129 -1.439,0.816 -0.561,-0.314 0.028,-1.061 0.028,-1.061 0,0 -0.706,0.136 -1.059,0 C -11.444,0.652 -11.117,0 -11.117,0 c -0.788,-0.109 -0.513,-0.599 -0.513,-0.599 0,0 0.196,0.253 1.012,0.253 0.816,0 1.153,-0.797 1.697,-0.797 0.544,0 0.54,0.517 0.54,0.517 1.007,-0.843 2.915,-0.843 2.915,-0.843 0,0 1.814,0 2.82,0.843 0,0 -0.051,-0.517 0.493,-0.517 0.544,0 0.857,0.797 1.674,0.797 0.815,0 1,-0.253 1,-0.253 0,0 0.268,0.49 -0.521,0.599"/></g><g transform="translate(21.2754,21.833)" id="g48"><path id="path50" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.598,0.163 -1.238,0.924 -2.081,0.924 -0.843,0 -1.225,-0.653 -1.225,-0.653 0,0 -0.467,0.653 -1.31,0.653 -0.843,0 -1.57,-0.761 -2.168,-0.924 -0.598,-0.164 -1.169,0 -1.169,0 0.137,-0.626 0.835,-0.768 0.835,-0.768 0.074,-0.388 0.659,-0.401 0.659,-0.401 0.079,-0.463 0.927,-0.144 0.927,-0.144 0,0 -0.053,-0.455 0.383,-0.4 0.435,0.054 1.171,0.815 1.171,0.815 0,0 -0.211,-0.217 -0.184,-0.415 0.028,-0.198 0.365,-0.183 0.365,-0.183 -0.299,-0.299 0.241,-0.652 0.241,-0.652 l 0.25,0.19 0.165,-0.19 c 0,0 0.496,0.353 0.197,0.652 0,0 0.316,-0.015 0.344,0.183 0.027,0.198 -0.195,0.415 -0.195,0.415 0,0 0.731,-0.761 1.166,-0.815 0.436,-0.055 0.38,0.4 0.38,0.4 0,0 0.847,-0.319 0.927,0.144 0,0 0.584,0.013 0.657,0.401 0,0 0.699,0.142 0.835,0.768 0,0 -0.571,-0.164 -1.17,0"/></g><g transform="translate(17.0205,24.2798)" id="g52"><path id="path54" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.121 0.383,0.218 0.856,0.218 1.329,0.218 1.713,0.121 1.713,0 1.713,-0.12 1.329,-0.217 0.856,-0.217 0.383,-0.217 0,-0.12 0,0"/></g><g transform="translate(18.8823,23.8447)" id="g56"><path id="path58" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.027,0.191 -0.142,0.218 -0.142,0.218 0,0 -0.449,-0.116 -0.863,-0.116 -0.415,0 -0.857,0.116 -0.857,0.116 0,0 -0.109,-0.027 -0.136,-0.218 -0.027,-0.19 -0.217,-0.775 -0.217,-0.775 l 0.353,0.388 0.299,-0.388 0.299,0.388 0.259,-0.388 0.265,0.388 0.303,-0.388 0.3,0.388 0.354,-0.388 c 0,0 -0.19,0.585 -0.217,0.775"/></g><g transform="translate(17.9692,26.1694)" id="g60"><path id="path62" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-1.06 0.729,-1.373 0.447,-0.938 1.02,-0.666 0,0 Z"/></g><path id="path64" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.081,21.928 -0.449,0 0,1.142 0.449,0 0,-1.142 z"/><g transform="translate(18.4307,14.9941)" id="g66"><path id="path68" style="fill:#cf1b26;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.294,0.407 0.233,0.714 0.172,1.02 -0.113,1.503 -0.194,1.812 -0.276,2.121 0.003,2.407 0.003,2.407 l -0.217,0.04 c 0,0 0.292,0.265 0.217,0.551 -0.074,0.286 -0.217,0.652 -0.257,0.979 -0.041,0.326 0.257,0.714 0.257,0.714 l -0.387,-0.225 -0.21,0.225 -0.205,-0.225 -0.38,0.225 c 0,0 0.299,-0.388 0.258,-0.714 C -0.961,3.65 -1.104,3.284 -1.179,2.998 -1.254,2.712 -0.961,2.447 -0.961,2.447 l -0.218,-0.04 c 0,0 0.279,-0.286 0.197,-0.595 C -1.063,1.503 -1.349,1.02 -1.41,0.714 -1.471,0.407 -1.179,0 -1.179,0 l -0.585,0.122 c 0.32,-0.652 0.693,-0.733 1.17,-0.733 0.476,0 0.856,0.081 1.175,0.733 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7E017" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#141414" d="M36 27L0 19v-5l36 8z"/><path fill="#EEE" d="M36 22L0 14V9l36 8z"/><g fill="#CF1B26"><path d="M21.596 14.935c.443.688.699 1.507.699 2.386 0 2.44-1.978 4.419-4.418 4.419-2.441 0-4.419-1.979-4.419-4.419 0-.879.257-1.698.699-2.386-.838.905-1.351 2.116-1.351 3.447 0 2.801 2.27 5.071 5.071 5.071 2.801 0 5.071-2.271 5.071-5.071 0-1.331-.513-2.542-1.352-3.447zm-11.893.571c.537.118.656.323.629.758 0 0 .273.053.463.325.191.272.367.543.693.652.327.109.585.325.585.978v2.42s-.06.245.076.57c.136.327.059.789-.947.789s-1.012-.435-.877-.761c.136-.326.293-.599.293-.599v-2.08s-.196-.285-.468-.476c-.272-.19-.846-.87-.927-1.523-.082-.651-.234-1.209.48-1.053zm16.257 0c-.537.118-.656.323-.629.758 0 0-.274.053-.464.325s-.268.543-.594.652c-.326.109-.485.325-.485.978v2.42s-.039.245-.176.57c-.136.327-.107.789.898.789 1.006 0 1.087-.435.951-.761s-.219-.599-.219-.599v-2.08s.097-.285.368-.476c.273-.19.796-.87.878-1.523.083-.651.185-1.209-.528-1.053z"/><path d="M23.435 24.738s.325-.652-.028-.788c-.354-.136-1.06 0-1.06 0s.589-.747.026-1.061c-.561-.313-.947.462-1.439.815-.491.354-.986.549-1.586.748-.598.199-1.378.285-1.378.285s-.875-.086-1.473-.285c-.599-.199-1.188-.395-1.68-.748s-.877-1.129-1.439-.815c-.562.313.028 1.061.028 1.061s-.707-.136-1.06 0c-.354.136-.026.788-.026.788-.788.109-.513.599-.513.599s.196-.253 1.012-.253 1.153.797 1.697.797.54-.517.54-.517c1.007.843 2.915.843 2.915.843s1.814 0 2.82-.843c0 0-.051.517.493.517s.857-.797 1.674-.797c.815 0 1 .253 1 .253s.267-.489-.523-.599zm-2.16-10.571c-.598-.163-1.238-.924-2.081-.924s-1.225.653-1.225.653-.467-.653-1.31-.653-1.569.761-2.168.924c-.598.164-1.169 0-1.169 0 .136.625.835.768.835.768.074.388.659.401.659.401.079.462.927.144.927.144s-.053.455.382.4c.435-.054 1.172-.816 1.172-.816s-.212.218-.184.415c.027.198.365.183.365.183-.299.299.241.653.241.653l.25-.19.165.19s.497-.353.197-.653c0 0 .316.015.344-.183.027-.198-.195-.415-.195-.415s.732.762 1.167.816c.436.054.38-.4.38-.4s.847.319.927-.144c0 0 .584-.014.657-.401 0 0 .699-.143.835-.768-.001 0-.572.164-1.171 0zm-4.254-2.447c0-.121.383-.218.857-.218.473 0 .857.097.857.218 0 .12-.384.217-.857.217-.474.001-.857-.097-.857-.217z"/><path d="M18.882 12.155c-.027-.191-.142-.218-.142-.218s-.449.116-.863.116c-.415 0-.857-.116-.857-.116s-.109.027-.136.218c-.027.19-.217.775-.217.775l.354-.388.299.388.299-.388.258.388.265-.388.303.388.3-.388.355.388s-.19-.584-.218-.775zm-.913-2.324v1.06l.729.313-.281-.435.572-.273zm-.31 3.099h.449v1.142h-.449zm.816 8.076s.294-.407.233-.714c-.061-.306-.346-.789-.427-1.098-.082-.309.198-.595.198-.595l-.217-.041s.292-.265.217-.551c-.075-.286-.217-.652-.258-.978-.041-.327.258-.714.258-.714l-.387.224-.211-.224-.205.224-.38-.224s.299.387.258.714c-.041.326-.184.693-.258.978-.075.286.218.551.218.551l-.218.041s.279.286.197.595c-.081.309-.367.792-.428 1.098-.061.307.231.714.231.714l-.584-.122c.319.652.692.733 1.169.733.477 0 .856-.081 1.175-.733l-.581.122z"/></g></svg>
\ No newline at end of file