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/1f937-1f3fc.svg b/public/emoji/1f937-1f3fc.svg
index df88b238b..af1de0404 100644
--- a/public/emoji/1f937-1f3fc.svg
+++ b/public/emoji/1f937-1f3fc.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(19,36)" id="g20"><path id="path22" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.721,0 -3.343,-0.406 -4.794,-1.111 -5.186,-1.042 -5.588,-1 -6,-1 c -3.866,0 -7,-3.134 -7,-7 l 0,-12 0.018,0 c 0.183,-6.467 5.471,-11.656 11.982,-11.656 6.511,0 11.799,5.189 11.982,11.656 l 0.018,0 0,9 C 11,-4.925 6.075,0 0,0"/></g><g transform="translate(27,15)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-11 5,0 16,0 5,0 0,11 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(14,31)" id="g28"><path id="path30" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,-5.308 -5,-5.936 L -5,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><path id="path32" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,9 1,0 0,-9 -1,0 0,9 z"/><g transform="translate(4.7021,9.5049)" id="g34"><path id="path36" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.283,0.059 -0.511,0 c 0,0.057 0.023,0.112 0.035,0.169 -0.347,0.214 -0.546,0.625 -0.458,1.047 0.113,0.542 0.643,0.89 1.186,0.78 l 2.091,-0.433 1.675,0 c 0.864,0 1.563,-0.7 1.563,-1.563 l 0,-0.783 0,-0.781 -3.747,0 C 1.551,-1.505 0.07,-0.836 0,0"/></g><g transform="translate(0,10.3447)" id="g38"><path id="path40" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.432 0.35,0.782 0.781,0.782 L 5.472,0 9.219,0 C 9.65,0 10,-0.351 10,-0.781 l 0,-1.564 -1.401,0 -3.599,0 -4.219,1.564 C 0.781,-0.781 0,-0.432 0,0"/></g><g transform="translate(4,0)" id="g42"><path id="path44" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 6,0 6,8 1,8 0,0 Z"/></g><path id="path46" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,9 -1,0 0,-9 1,0 0,9 z"/><g transform="translate(31.2979,9.5049)" id="g48"><path id="path50" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.283,0.059 0.511,0 c 0,0.057 -0.023,0.112 -0.035,0.169 0.347,0.214 0.546,0.625 0.458,1.047 -0.113,0.542 -0.643,0.89 -1.186,0.78 l -2.091,-0.433 -1.675,0 c -0.864,0 -1.563,-0.7 -1.563,-1.563 l 0,-0.783 0,-0.781 3.747,0 c 0,0 1.481,0.669 1.551,1.505"/></g><g transform="translate(36,10.3447)" id="g52"><path id="path54" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.432 -0.35,0.782 -0.781,0.782 L -5.472,0 -9.219,0 C -9.65,0 -10,-0.351 -10,-0.781 l 0,-1.564 1.401,0 3.599,0 4.219,1.564 C -0.781,-0.781 0,-0.432 0,0"/></g><g transform="translate(32,0)" id="g56"><path id="path58" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 0,8 5,0 1,-8 z"/></g><g transform="translate(19,16.5)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(20.5,13)" id="g64"><path id="path66" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.5,0 C -0.776,0 -1,0.224 -1,0.5 -1,0.776 -0.776,1 -0.5,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(14,20)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(22,20)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFE51E" d="M19 0c-1.721 0-3.343.406-4.793 1.111C13.814 1.043 13.412 1 13 1 9.134 1 6 4.134 6 8v12h.018C6.201 26.467 11.489 31.656 18 31.656S29.799 26.467 29.982 20H30v-9c0-6.075-4.925-11-11-11z"/><path fill="#9268CA" d="M27 21H9c-2.209 0-4 1.791-4 4v11h26V25c0-2.209-1.791-4-4-4z"/><path fill="#F3D2A2" d="M14 5s-.003 5.308-5 5.936V17c0 4.971 4.029 9 9 9s9-4.029 9-9v-5.019C15.89 11.605 14 5 14 5z"/><path fill="#7450A8" d="M10 27h1v9h-1z"/><path fill="#D2A077" d="M4.702 26.495l-.283-.059h-.511c0-.058.023-.112.035-.169-.348-.215-.546-.625-.458-1.048.112-.542.643-.89 1.186-.779l2.091.433h1.676c.863 0 1.562.7 1.562 1.564V28H6.253s-1.481-.669-1.551-1.505z"/><path fill="#F3D2A2" d="M0 25.655c0-.432.35-.782.781-.782l4.69.782h3.747c.432 0 .781.351.781.781V28H5L.781 26.437S0 26.087 0 25.655z"/><path fill="#9268CA" d="M4 36h6v-8H5z"/><path fill="#7450A8" d="M25 27h1v9h-1z"/><path fill="#D2A077" d="M31.298 26.495l.283-.059h.511c0-.058-.023-.112-.035-.169.348-.215.546-.625.458-1.048-.112-.542-.642-.89-1.185-.779l-2.091.433h-1.676c-.863 0-1.562.7-1.562 1.564V28h3.747c-.001 0 1.48-.669 1.55-1.505z"/><path fill="#F3D2A2" d="M36 25.655c0-.432-.35-.782-.781-.782l-4.691.782h-3.747c-.432 0-.781.351-.781.781V28h5l4.219-1.563s.781-.35.781-.782z"/><path fill="#9268CA" d="M32 36h-6v-8h5z"/><path fill="#C1694F" d="M19 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#DF1F32" d="M20.5 23H20c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h.5c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M14 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/></svg>
\ No newline at end of file