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/1f482-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f482-1f3fc-200d-2640-fe0f.svg
index 1d07ec5af..04f10dd10 100644
--- a/public/emoji/1f482-1f3fc-200d-2640-fe0f.svg
+++ b/public/emoji/1f482-1f3fc-200d-2640-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 36,0 36,36 0,36 0,0 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,18)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -4.029,-5 -9,-5 -4.971,0 -9,0.029 -9,5 0,8.938 4.029,9 9,9 4.971,0 9,-0.101 9,-9"/></g><g transform="translate(28,0)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.5 C 0,5.814 -1.686,8 -5,8 l -10,0 c -3.313,0 -5,-2.186 -5,-5.5 L -20,0 0,0 Z"/></g><g transform="translate(17.9438,26.1904)" id="g28"><path id="path30" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.099,0 8.265,-1.55 8.265,-8.265 0,-6.716 0,-8.265 -1.55,-8.265 -1.549,0 -3.616,1.549 -6.715,1.549 -3.099,0 -5.121,-1.549 -6.715,-1.549 -1.727,0 -1.55,6.199 -1.55,8.265 C -8.265,-1.55 -3.099,0 0,0"/></g><g transform="translate(14.8628,7.4873)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.249,-0.908 2.041,-1.153 3.124,-1.153 1.082,0 1.874,0.246 3.123,1.153 l 0,2.729 L 0,2.729 0,0 Z"/></g><g transform="translate(10.9482,17.1172)" id="g36"><path id="path38" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.97 3.132,9 6.996,9 3.863,0 6.996,-4.03 6.996,-9 0,-4.97 -3.133,-8.763 -6.996,-8.763 C 3.132,-8.763 0,-4.97 0,0"/></g><g transform="translate(17.9438,10.4492)" id="g40"><path id="path42" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.368,0 -2.084,0.676 -2.161,0.754 -0.228,0.228 -0.228,0.596 0,0.824 0.226,0.226 0.59,0.227 0.819,0.006 C -1.313,1.557 -0.873,1.166 0,1.166 0.885,1.166 1.325,1.568 1.344,1.585 1.576,1.802 1.943,1.796 2.166,1.568 2.385,1.339 2.386,0.979 2.162,0.754 2.085,0.676 1.368,0 0,0"/></g><g transform="translate(15.1704,15.2695)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.137,0 c -0.359,0 -0.652,0.293 -0.652,0.651 l 0,0.859 c 0,0.357 0.293,0.65 0.652,0.65 L 0,2.16 c 0.358,0 0.652,-0.293 0.652,-0.65 l 0,-0.859 C 0.652,0.293 0.358,0 0,0"/></g><g transform="translate(20.9346,15.2695)" id="g48"><path id="path50" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.138,0 c -0.358,0 -0.651,0.293 -0.651,0.651 l 0,0.859 c 0,0.357 0.293,0.65 0.651,0.65 L 0,2.16 c 0.357,0 0.651,-0.293 0.651,-0.65 l 0,-0.859 C 0.651,0.293 0.357,0 0,0"/></g><g transform="translate(18.6787,13.042)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.391,0 c -0.212,0 -0.385,0.173 -0.385,0.385 l 0,0.082 c 0,0.212 0.173,0.385 0.385,0.385 l 1.391,0 c 0.212,0 0.385,-0.173 0.385,-0.385 l 0,-0.082 C 0.385,0.173 0.212,0 0,0"/></g><g transform="translate(13.5781,6.5088)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.653,-0.737 c -0.272,-0.043 -0.529,0.143 -0.572,0.416 l -0.157,0.987 c -0.043,0.271 0.144,0.528 0.416,0.571 l 4.653,0.738 C -0.041,2.018 0.216,1.831 0.259,1.56 L 0.416,0.571 C 0.459,0.3 0.272,0.043 0,0"/></g><g transform="translate(22.4482,6.5088)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 4.652,-0.737 c 0.273,-0.043 0.53,0.143 0.573,0.416 L 5.382,0.666 C 5.425,0.937 5.237,1.194 4.966,1.237 L 0.312,1.975 C 0.041,2.018 -0.217,1.831 -0.26,1.56 L -0.416,0.571 C -0.459,0.3 -0.272,0.043 0,0"/></g><path id="path64" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.5,0 -1,0 0,6 1,0 0,-6 z"/><g transform="translate(14.8701,9.0293)" id="g66"><path id="path68" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.574,0.117 -0.574,-1.096 0,-1.214 1.704,-2.778 3.704,-2.778 l 0,1.852 C 2.13,-2.022 0,-1.459 0,0"/></g><g transform="translate(21.1299,9.0293)" id="g70"><path id="path72" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.574,0.117 0.574,-1.096 0,-1.214 -1.748,-2.778 -3.704,-2.778 l 0,1.852 C -2.071,-2.022 0,-1.459 0,0"/></g><g transform="translate(11.875,18)" id="g74"><path id="path76" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.174,-9 6.113,-9 6.287,0 6.137,9 6.137,9 l 0.875,0 c 0,0 -0.307,-10 -7,-10 -6.693,0 -7,10 -7,10 L 0,0 Z"/></g><g transform="translate(26,18)" id="g78"><path id="path80" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -0.55,0 -1,0.45 -1,1 l 0,11 c 0,3.3 2.7,6 6,6 l 6,0 c 3.3,0 6,-2.7 6,-6 L 1,1 C 1,0.45 0.55,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M28 36v-2.5c0-3.313-1.687-5.5-5-5.5H13c-3.313 0-5 2.187-5 5.5V36h20z"/><path fill="#292F33" d="M27 6c0-3.3-2.7-6-6-6h-6c-3.3 0-6 2.7-6 6v12c0 4.971 4.029 5 9 5s9-.029 9-5V6z"/><path fill="#FFE51E" d="M18 18H9.679s-.016 1.731.01 2.844c.06 2.517.342 5.496 1.539 5.496 1.594 0 3.616-1.549 6.715-1.549 3.099 0 5.166 1.549 6.715 1.549 1.293 0 1.506-1.09 1.542-5.345.008-.846.009-2.995.009-2.995H18z"/><path fill="#F3D2A2" d="M24.94 18.883c0-.298-.013-.592-.035-.883H10.983c-.022.291-.035.585-.035.883 0 3.545 1.598 6.483 3.915 7.881v1.749c1.249.907 2.041 1.153 3.124 1.153 1.083 0 1.874-.246 3.124-1.153v-1.799c2.27-1.418 3.829-4.329 3.829-7.831z"/><path fill="#DF1F32" d="M17.944 25.551c-1.368 0-2.084-.676-2.161-.754-.228-.228-.228-.597 0-.824.226-.225.59-.227.819-.006.03.027.47.418 1.342.418.885 0 1.325-.402 1.344-.419.232-.218.599-.211.821.017.221.229.221.589-.003.814-.078.077-.794.754-2.162.754z"/><path fill="#662113" d="M15.17 20.731h-.137c-.358 0-.652-.293-.652-.652v-.858c0-.358.293-.652.652-.652h.137c.358 0 .652.293.652.652v.858c0 .359-.293.652-.652.652zm5.764 0h-.137c-.358 0-.652-.293-.652-.652v-.858c0-.358.293-.652.652-.652h.137c.358 0 .652.293.652.652v.858c0 .359-.293.652-.652.652z"/><path fill="#C1694F" d="M18.679 22.958h-1.391c-.212 0-.385-.173-.385-.385v-.081c0-.212.173-.385.385-.385h1.391c.212 0 .385.173.385.385v.081c0 .212-.173.385-.385.385z"/><path fill="#292F33" d="M13.578 29.492l-4.653.737c-.272.043-.529-.144-.572-.416l-.156-.988c-.043-.272.144-.529.416-.572l4.653-.737c.272-.043.529.144.572.416l.156.988c.043.271-.144.529-.416.572zm8.87 0l4.653.737c.272.043.529-.144.572-.416l.156-.988c.043-.272-.144-.529-.416-.572l-4.653-.737c-.272-.043-.529.144-.572.416l-.156.988c-.043.271.144.529.416.572z"/><path fill="#99AAB5" d="M11.875 18s-.174 9 6.113 9 6.137-9 6.137-9H25s-.307 10-7 10-7-10-7-10h.875z"/><path fill="#F5F8FA" d="M17.5 30h1v6h-1z"/><path fill="#292F33" d="M21.13 26.971c0 1.459-2.071 2.022-3.13 2.022-1 0-3.13-.563-3.13-2.022 0 0-.574-.117-.574 1.096 0 1.214 1.704 2.778 3.704 2.778 1.956 0 3.704-1.564 3.704-2.778 0-1.213-.574-1.096-.574-1.096z"/></svg>
\ No newline at end of file