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/1f473-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f473-1f3fb-200d-2642-fe0f.svg
index 9d8c68772..bb59f1199 100644
--- a/public/emoji/1f473-1f3fb-200d-2642-fe0f.svg
+++ b/public/emoji/1f473-1f3fb-200d-2642-fe0f.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,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 9.99,8 C 6.677,8 3.991,5.314 3.991,2 l 0,0 0,-2 27.999,0 0,2 c 0,3.314 -2.685,6 -6,6 l 0,0 -16,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" 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(31.9902,0)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(11,-1.75)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.19,0 -0.38,0.072 -0.526,0.216 -0.295,0.291 -0.299,0.765 -0.008,1.06 5.537,5.617 12.459,9.607 17.223,9.93 0.416,0.015 0.772,-0.284 0.799,-0.697 C 17.517,10.096 17.204,9.737 16.791,9.71 13.108,9.46 6.653,6.43 0.534,0.224 0.387,0.074 0.194,0 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(13.6299,7.8994)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.268 2.848,-1.963 4.36,-1.963 1.512,0 2.616,0.696 4.36,1.963 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6221,10.0273)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.363,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(11.4346,20.0645)" id="g52"><path id="path54" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.8232,20.0645)" id="g56"><path id="path58" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(9.4678,19.0405)" id="g60"><path id="path62" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.733,11.001 8.439,11.001 4.707,0 8.606,-5.412 8.606,-11.001 0,-5.589 -3.816,-10.121 -8.523,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(13.9902,19)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(21.9902,19)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(18.7402,16.25)" id="g72"><path id="path74" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(18,26.0659)" id="g84"><path id="path86" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 7.149,-1.858 8.245,-5.204 8.723,-4.183 9,-1.947 9,-0.686 9,3.153 6,5.934 1.125,5.934 l -2.25,0 C -5.25,5.934 -9,3.153 -9,-0.686 -9,-1.947 -8.723,-4.349 -8.246,-5.37 -7.149,-2.022 0,0 0,0"/></g><g transform="translate(26.9766,24.8242)" id="g88"><path id="path90" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.397,1.115 -3.035,2.036 -4.604,2.558 -4.969,2.68 -5.358,2.482 -5.48,2.121 -5.601,1.758 -5.404,1.366 -5.042,1.245 -3.376,0.689 -1.557,-0.411 -0.169,-1.68 -0.085,-1.098 -0.028,-0.514 0,0"/></g><g transform="translate(9.1167,23.6895)" id="g92"><path id="path94" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.007,1.436 8.667,5.74 16.341,5.8 15.908,6.3 15.4,6.746 14.831,7.126 8.126,6.628 2.392,3.287 -0.111,1.605 -0.102,1.15 -0.065,0.592 0,0"/></g><g transform="translate(26.3906,28.0938)" id="g96"><path id="path98" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.028,0.004 -0.054,0.016 -0.083,0.016 -2.835,0 -5.703,-0.71 -8.528,-2.108 0.14,0.042 0.22,0.064 0.22,0.064 0,0 0.816,-0.212 1.937,-0.62 2.126,0.844 4.263,1.28 6.371,1.28 0.203,0 0.381,0.091 0.509,0.229 C 0.323,-0.744 0.18,-0.363 0,0"/></g><g transform="translate(9.1875,26.9644)" id="g100"><path id="path102" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.477,1.586 7.19,3.888 12.431,4.8 11.636,5.036 10.796,5.036 9.938,5.036 l -1.765,0 C 5.448,3.977 3.021,3.179 1.15,2.149 0.615,1.47 0.216,0.834 0,0"/></g><g transform="translate(26.4229,15.7266)" id="g104"><path id="path106" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.576 -1.617,0.557 -2.115,0 -0.704,-0.789 -2.115,-2.366 -3.527,-1.577 -1.993,1.114 -2.82,0.788 -2.82,0.788 0,0 -0.826,0.326 -2.82,-0.788 -1.41,-0.789 -2.82,0.788 -3.526,1.577 -0.498,0.557 -2.115,1.576 -2.115,0 0,-2.366 1.41,-3.943 1.41,-3.943 1.411,-3.942 4.231,-3.942 4.231,-3.942 0.705,-0.789 4.936,-0.789 5.64,0 0,0 2.823,0 4.231,3.942 0,0 1.411,1.577 1.411,3.943"/></g><g transform="translate(18,13.5)" id="g108"><path id="path110" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 5,0 3,-1.381 0,-1.381 -3,-1.381 -5,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="M31.99 36v-2c0-3.314-2.685-6-6-6h-16c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#5C913B" d="M13.123 36c5.274-4.852 10.596-7.402 14.013-7.888-.371-.072-.754-.112-1.146-.112h-3.607c-3.719 1.618-7.837 4.462-11.434 8h2.174z"/><path fill="#F7DECE" d="M13.63 28.101c1.744 1.268 2.848 1.963 4.36 1.963 1.512 0 2.615-.696 4.359-1.963V24.29h-8.72v3.811zm-2.195-12.165c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.388 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#F7DECE" d="M9.468 16.959c0-5.589 3.733-11.001 8.439-11.001 4.707 0 8.605 5.412 8.605 11.001 0 5.589-3.815 10.121-8.522 10.121-4.706 0-8.522-4.531-8.522-10.121"/><path fill="#662113" d="M13.99 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#C1694F" d="M18.74 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#292F33" d="M24.308 20.273c-.704.789-2.115 2.366-3.526 1.577-1.993-1.114-2.82-.788-2.82-.788s-.826-.326-2.82.788c-1.41.789-2.82-.788-3.525-1.577-.498-.557-2.115-1.576-2.115 0 0 2.366 1.41 3.943 1.41 3.943 1.411 3.941 4.23 3.941 4.23 3.941.706.789 4.936.789 5.641 0 0 0 2.822 0 4.23-3.941 0 0 1.411-1.577 1.411-3.943-.001-1.576-1.618-.556-2.116 0zM18 23.881c-3 0-5-1.381 0-1.381s3 1.381 0 1.381z"/><path fill="#E6E7E8" d="M18 9.934s7.149 1.858 8.245 5.204c.478-1.021.755-3.257.755-4.518C27 6.781 24 4 19.125 4h-2.25C12.75 4 9 6.781 9 10.62c0 1.262.277 3.664.754 4.684C10.851 11.957 18 9.934 18 9.934z"/><path fill="#D1D3D4" d="M24.248 9.428c.688-.091 1.376-.153 2.06-.153.203 0 .381-.091.509-.229-.102-.395-.246-.775-.426-1.139-.028-.004-.054-.016-.083-.016-2.835 0-5.703.71-8.528 2.108.139-.043.22-.065.22-.065s.815.212 1.937.621c.652-.259 1.304-.466 1.957-.647.015.006.025.018.041.024 1.666.555 3.485 1.655 4.873 2.924.084-.582.141-1.166.169-1.68-.844-.674-1.778-1.262-2.729-1.748zM9.117 12.311c2.007-1.436 8.667-5.74 16.341-5.8-.434-.5-.941-.946-1.51-1.327-6.706.498-12.44 3.839-14.943 5.521.01.456.046 1.014.112 1.606zm.071-3.275c2.477-1.586 7.19-3.888 12.431-4.8C20.823 4 19.983 4 19.125 4H17.36c-2.725 1.059-5.152 1.857-7.022 2.887-.536.678-.934 1.314-1.15 2.149z"/></svg>
\ No newline at end of file