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/1f9da-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f9da-1f3fd-200d-2640-fe0f.svg
index 1cf49450f..9af4964ad 100644
--- a/public/emoji/1f9da-1f3fd-200d-2640-fe0f.svg
+++ b/public/emoji/1f9da-1f3fd-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,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(20.7689,15.7271)" id="g20"><path id="path22" style="fill:#abdfff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.558,-6.089 -5.676,-12.675 -2.497,-14.71 3.178,-2.035 9.45,1.252 14.008,7.341 C 16.069,-1.28 14.263,9.66 14.008,9.262 12.231,6.488 4.558,6.089 0,0"/></g><g transform="translate(15.2555,15.7271)" id="g24"><path id="path26" style="fill:#abdfff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.558,-6.089 5.676,-12.675 2.498,-14.71 -3.179,-2.035 -9.451,1.252 -14.009,7.341 C -16.069,-1.28 -14.351,9.6 -14.008,9.262 -10.255,5.563 -4.558,6.089 0,0"/></g><g transform="translate(31.4018,18.1712)" id="g28"><path id="path30" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.96,-1.604 -1.586,-3.147 -4.251,-5.659 -1.029,-0.971 -0.94,-2.246 0.18,-1.398 2.663,2.015 4.305,5.221 4.847,7.268 C 1.158,1.652 0.484,0.808 0,0 m -26.804,0 c 0.96,-1.604 1.586,-3.147 4.251,-5.659 1.03,-0.971 0.941,-2.246 -0.179,-1.398 -2.664,2.015 -4.306,5.221 -4.848,7.268 -0.382,1.441 0.293,0.597 0.776,-0.211"/></g><g transform="translate(31,0)" id="g32"><path id="path34" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(17.9453,32.9307)" id="g36"><path id="path38" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.947,-4.053 10.947,-12.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.79,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.895,-2.052 -2.288,0 -2.054,8.21 -2.054,10.948 C -10.949,-4.053 -4.105,0 0,0"/></g><g transform="translate(14.3281,8.9824)" id="g40"><path id="path42" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-0.98 3.672,-0.98 0.708,0 2.194,-0.085 3.66,0.98 l 0,3.203 L 0,3.203 0,0 Z"/></g><g transform="translate(14.3223,10.8213)" id="g44"><path id="path46" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.022,-1.155 2.29,-1.468 3.668,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(9.7339,20.2822)" id="g48"><path id="path50" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,12.564 8.211,12.564 4.534,0 8.209,-6.73 8.209,-12.564 0,-5.833 -3.675,-10.285 -8.209,-10.285 C 3.676,-10.285 0,-5.833 0,0"/></g><g transform="translate(17.9453,12.457)" id="g52"><path id="path54" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(7.7251,17)" id="g56"><path id="path58" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.737,4.051 0.684,0.685 2.052,2.026 2.052,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.719,0 c 0.005,2 0.005,1.924 0.005,3.202 0,8.895 -4.892,12.729 -10.948,12.729 C 4.275,15.931 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(26,21)" id="g60"><path id="path62" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.47,-0.129 c 0,0 -1.192,-3.4 -0.001,-3.996 C 2.194,-5.457 3,-0.332 3,1 3,2 0,0 0,0"/></g><g transform="translate(10,21)" id="g64"><path id="path66" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.47,-0.129 c 0,0 1.192,-3.4 0.001,-3.996 C -2.194,-5.457 -3,-0.332 -3,1 -3,2 0,0 0,0"/></g><g transform="translate(14.6084,18.1133)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(21.373,18.1133)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(18.8359,15.5)" id="g76"><path id="path78" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(9,0)" id="g80"><path id="path82" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 18,0 18,5 15.5,3 13.5,5 11.281,3 9,5 6.766,3 4.516,5 2.5,3 0,5 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#ABDFFF" d="M20.769 20.273c-4.558 6.089-5.676 12.675-2.497 14.71 3.179 2.035 9.451-1.252 14.008-7.341 4.558-6.089 2.752-17.029 2.497-16.631-1.777 2.774-9.45 3.173-14.008 9.262z"/><path fill="#ABDFFF" d="M15.255 20.273c4.558 6.089 5.676 12.675 2.498 14.71-3.179 2.035-9.451-1.252-14.009-7.341S.904 10.673 1.247 11.011C5 14.71 10.698 14.184 15.255 20.273z"/><path fill="#55ACEE" d="M4.598 17.829c.96 1.604 1.586 3.147 4.251 5.659 1.03.971.941 2.245-.179 1.398-2.664-2.015-4.306-5.221-4.848-7.268-.382-1.441.292-.597.776.211zm26.804 0c-.96 1.604-1.586 3.147-4.251 5.659-1.03.971-.941 2.245.179 1.398 2.664-2.015 4.306-5.221 4.848-7.268.382-1.441-.292-.597-.776.211z"/><path fill="#D5AB88" d="M31 36v-3.5c0-3.314-3.685-5.5-7-5.5H12c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#963B22" d="M17.945 3.069c4.105 0 10.947 4.053 10.947 12.947 0 8.896 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.001-8.894 6.844-12.947 10.949-12.947"/><path fill="#D5AB88" d="M14.328 27.018c1.466 1.065 2.964.98 3.672.98s2.194.085 3.66-.98v-3.203h-7.332v3.203z"/><path fill="#CC9B7A" d="M14.322 25.179c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.338v2.936z"/><path fill="#D5AB88" d="M9.734 15.718c0-5.834 3.676-12.564 8.211-12.564 4.533 0 8.209 6.729 8.209 12.564 0 5.833-3.676 10.285-8.209 10.285-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DF1F32" d="M17.945 23.543c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.535.885"/><path fill="#963B22" d="M7.725 19c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.685-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.023-.531-.04.469h.719c.006-2 .006-1.924.006-3.202 0-8.895-4.893-12.729-10.948-12.729C12 3.069 6.997 6.848 6.997 15.743c0 .793-.02 1.257.008 3.257h.72z"/><path fill="#D5AB88" d="M26 15l-.47.129s-1.192 3.401 0 3.997C28.194 20.457 29 15.332 29 14c0-1-3 1-3 1zm-16 0l.47.129s1.192 3.401 0 3.997C7.806 20.457 7 15.332 7 14c0-1 3 1 3 1z"/><path fill="#662113" d="M14.608 17.887c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#C1694F" d="M18.836 20.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.191.423-.424.423"/><path fill="#77B255" d="M9 36h18v-5l-2.5 2-2-2-2.219 2L18 31l-2.234 2-2.25-2-2.016 2L9 31z"/></svg>
\ No newline at end of file