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/1f932-1f3fd.svg b/public/emoji/1f932-1f3fd.svg
index e64b1fba4..78d13a06e 100644
--- a/public/emoji/1f932-1f3fd.svg
+++ b/public/emoji/1f932-1f3fd.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(7.2777,6.0062)" id="g20"><path id="path22" style="fill:#b78b60;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.059,-0.982 1.052,-1.262 2.065,-1.201 1.016,0.06 3.726,-0.768 4.679,-0.77 1.687,-0.002 2.268,0.83 2.332,2.319 0.146,3.375 1.646,3.458 1.646,7.375 l 0,13.271 c 0,1.765 -1.979,2.61 -2.312,1.094 C 7.767,19.162 7.812,16.991 7.76,15.716 l -0.516,0.129 c 0,0 0.47,5.078 0.983,7.471 0.371,1.741 -2.718,2.381 -3.093,0.64 -0.497,-2.308 -0.61,-6.273 -0.646,-7.801 l -0.639,0.057 c 0,0 0.222,3.767 0.982,8.044 0.283,1.609 -2.803,2.38 -3.189,0.634 -0.503,-2.257 -0.87,-6.7 -0.856,-9.054 L 0.158,15.703 c 0,0 0.376,4.698 0.92,7.436 0.27,1.357 -2.188,2.174 -2.744,0.184 -1.6,-5.688 -1.006,-10.688 -1.017,-11.13 C -2.732,10.343 -3.16,8.207 -3.909,8.751 -5.04,9.575 -6.671,8.512 -5.273,6.431 -3.695,4.087 -0.292,4.339 -0.173,2.344 -0.121,1.488 0,0 0,0"/></g><g transform="translate(5.336,4.9674)" id="g24"><path id="path26" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.058,-0.982 0.946,-1.363 1.96,-1.305 1.014,0.064 5.611,0.295 6.561,0.354 0.95,0.055 1.92,0.879 1.858,1.893 -0.06,1.015 -0.196,2.462 0.643,3.931 0.458,0.798 1.299,3.784 1.08,9.472 -0.146,3.771 0.033,6.722 0.137,8.271 0.092,1.354 -2.143,1.898 -2.45,0.125 C 9.28,19.799 9.145,18.074 9.008,16.682 L 8.49,16.809 c 0,0 0.475,5.32 0.936,7.724 0.314,1.634 -2.288,2.076 -2.66,0.336 -0.498,-2.31 -0.995,-6.219 -1.03,-7.748 l -0.642,0.055 c 0,0 0.232,4.085 0.994,8.365 0.254,1.428 -2.42,1.894 -2.809,0.148 -0.5,-2.257 -1.263,-6.534 -1.247,-8.888 L 1.405,16.669 c 0,0 -0.033,3.689 0.921,7.436 0.34,1.34 -2.189,2.174 -2.748,0.184 C -0.98,22.304 -1.231,19.287 -1.341,17.506 -2.706,18.72 -4.134,17.911 -4.088,17.47 -3.685,13.658 -6.518,10.741 -3.662,6.394 -2.108,4.03 -1.127,4.087 -0.132,2.349 0.39,1.437 0,0 0,0"/></g><g transform="translate(4.3175,16.293)" id="g28"><path id="path30" style="fill:#b78b60;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.718,-0.2 1.46,-0.475 2.099,-0.931 3.216,-1.726 3.896,-2.61 4.062,-2.9 4.236,-3.198 4.849,-3.063 4.587,-2.555 4.33,-2.062 3.488,-1.123 2.494,-0.445 1.8,0.03 0.799,0.43 -0.103,0.669 -0.265,0.712 0.906,4.801 -0.323,6.18 0.146,5.332 -0.666,1.632 -0.666,1.019 -0.666,0.407 -0.382,0.107 0,0"/></g><g transform="translate(28.7223,6.0062)" id="g32"><path id="path34" style="fill:#b78b60;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.059,-0.982 -1.052,-1.262 -2.065,-1.201 -1.016,0.06 -3.726,-0.768 -4.679,-0.77 -1.687,-0.002 -2.268,0.83 -2.332,2.319 -0.146,3.375 -1.646,3.458 -1.646,7.375 l 0,13.271 c 0,1.765 1.979,2.61 2.312,1.094 0.643,-2.926 0.598,-5.097 0.65,-6.372 l 0.516,0.129 c 0,0 -0.47,5.078 -0.983,7.471 -0.371,1.741 2.718,2.381 3.093,0.64 0.497,-2.308 0.61,-6.273 0.646,-7.801 l 0.639,0.057 c 0,0 -0.222,3.767 -0.982,8.044 -0.283,1.609 2.803,2.38 3.189,0.634 0.503,-2.257 0.87,-6.7 0.856,-9.054 l 0.628,-0.133 c 0,0 -0.422,4.995 -0.92,7.436 -0.277,1.355 2.188,2.174 2.744,0.184 1.6,-5.688 1.006,-10.688 1.017,-11.13 C 2.732,10.343 3.16,8.207 3.909,8.751 5.04,9.575 6.671,8.512 5.273,6.431 3.695,4.087 0.292,4.339 0.173,2.344 0.121,1.488 0,0 0,0"/></g><g transform="translate(30.664,4.9674)" id="g36"><path id="path38" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.058,-0.982 -0.946,-1.363 -1.96,-1.305 -1.014,0.064 -5.611,0.295 -6.561,0.354 -0.95,0.055 -1.92,0.879 -1.858,1.893 0.06,1.015 0.196,2.462 -0.643,3.931 -0.458,0.798 -1.299,3.784 -1.08,9.472 0.146,3.771 -0.033,6.722 -0.137,8.271 -0.092,1.354 2.143,1.898 2.45,0.125 0.509,-2.942 0.644,-4.667 0.781,-6.059 l 0.518,0.127 c 0,0 -0.475,5.32 -0.936,7.724 -0.314,1.634 2.288,2.076 2.66,0.336 0.498,-2.31 0.995,-6.219 1.03,-7.748 l 0.642,0.055 c 0,0 -0.232,4.085 -0.994,8.365 -0.254,1.428 2.42,1.894 2.809,0.148 0.5,-2.257 1.263,-6.534 1.247,-8.888 l 0.627,-0.132 c 0,0 0.033,3.689 -0.921,7.436 -0.34,1.34 2.189,2.174 2.748,0.184 C 0.98,22.304 1.231,19.287 1.341,17.506 2.706,18.72 4.134,17.911 4.088,17.47 3.685,13.658 6.518,10.741 3.662,6.394 2.108,4.03 1.127,4.087 0.132,2.349 -0.39,1.437 0,0 0,0"/></g><g transform="translate(31.6825,16.293)" id="g40"><path id="path42" style="fill:#b78b60;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.718,-0.2 -1.46,-0.475 -2.099,-0.931 -3.216,-1.726 -3.896,-2.61 -4.062,-2.9 c -0.174,-0.298 -0.787,-0.163 -0.525,0.345 0.257,0.493 1.099,1.432 2.093,2.11 C -1.8,0.03 -0.799,0.43 0.103,0.669 0.265,0.712 -0.906,4.801 0.323,6.18 -0.146,5.332 0.667,1.632 0.667,1.019 0.667,0.407 0.382,0.107 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#B78B60" d="M7.278 29.994c.059.982 1.052 1.262 2.065 1.201 1.016-.059 3.726.768 4.679.77 1.687.003 2.268-.829 2.332-2.319C16.5 26.271 18 26.188 18 22.271V9c0-1.766-1.98-2.61-2.312-1.094-.642 2.925-.598 5.097-.65 6.372l-.516-.129s.47-5.078.983-7.471c.371-1.741-2.718-2.381-3.092-.641-.498 2.308-.611 6.273-.646 7.801l-.639-.057s.221-3.768.981-8.045c.284-1.609-2.802-2.38-3.189-.634-.502 2.257-.87 6.7-.855 9.055l-.629.133s.376-4.698.921-7.436c.27-1.357-2.188-2.174-2.744-.184-1.6 5.688-1.006 10.688-1.017 11.13-.049 1.85-.477 3.986-1.225 3.442-1.131-.824-2.763.239-1.364 2.319 1.577 2.344 4.98 2.093 5.099 4.087.05.858.172 2.346.172 2.346"/><path fill="#D5AB88" d="M5.336 31.033c.058.982.946 1.363 1.96 1.305 1.013-.064 5.61-.295 6.56-.354.951-.055 1.92-.879 1.858-1.892-.06-1.016-.196-2.463.643-3.931.458-.798 1.3-3.784 1.08-9.472-.146-3.771.033-6.722.138-8.271.091-1.354-2.143-1.898-2.45-.125-.509 2.942-.644 4.667-.781 6.059l-.518-.128s.474-5.32.935-7.724c.315-1.634-2.287-2.076-2.66-.335-.498 2.31-.995 6.219-1.03 7.747l-.641-.054s.232-4.085.994-8.365c.253-1.428-2.421-1.894-2.809-.148-.5 2.255-1.263 6.533-1.247 8.886l-.626.133s-.033-3.69.92-7.436c.34-1.34-2.188-2.174-2.748-.184-.558 1.985-.809 5.002-.919 6.783-1.364-1.214-2.793-.405-2.746.036.403 3.812-2.43 6.729.426 11.076 1.554 2.364 2.535 2.307 3.529 4.044.522.913.132 2.35.132 2.35"/><path fill="#B78B60" d="M4.317 19.707c.718.2 1.46.475 2.099.931 1.117.795 1.797 1.679 1.962 1.969.175.298.787.164.525-.345-.256-.494-1.099-1.432-2.093-2.11-.694-.475-1.696-.875-2.597-1.114-.162-.043 1.01-4.132-.22-5.511.469.848-.344 4.548-.344 5.161s.286.912.668 1.019zm24.405 10.287c-.059.982-1.052 1.262-2.065 1.201-1.016-.059-3.726.768-4.679.77-1.687.003-2.268-.829-2.332-2.319C19.5 26.271 18 26.188 18 22.271V9c0-1.766 1.98-2.61 2.312-1.094.642 2.925.597 5.097.65 6.372l.516-.129s-.47-5.078-.983-7.471c-.371-1.741 2.718-2.381 3.092-.641.498 2.308.611 6.273.646 7.801l.639-.057s-.221-3.768-.981-8.045c-.284-1.609 2.802-2.38 3.189-.634.502 2.257.87 6.7.855 9.055l.629.133s-.423-4.995-.921-7.436c-.277-1.355 2.188-2.174 2.744-.184 1.6 5.688 1.006 10.688 1.017 11.13.049 1.85.477 3.986 1.225 3.442 1.131-.824 2.763.239 1.364 2.319-1.577 2.344-4.98 2.093-5.099 4.087-.05.858-.172 2.346-.172 2.346"/><path fill="#D5AB88" d="M30.664 31.033c-.058.982-.946 1.363-1.96 1.305-1.013-.064-5.61-.295-6.56-.354-.951-.055-1.92-.879-1.858-1.892.06-1.016.196-2.463-.643-3.931-.458-.798-1.3-3.784-1.08-9.472.146-3.771-.033-6.722-.138-8.271-.091-1.354 2.143-1.898 2.45-.125.509 2.942.644 4.667.781 6.059l.518-.128s-.474-5.32-.935-7.724c-.315-1.634 2.287-2.076 2.66-.335.498 2.31.995 6.219 1.03 7.747l.641-.054s-.232-4.085-.994-8.365c-.253-1.428 2.421-1.894 2.809-.148.499 2.256 1.262 6.534 1.247 8.888l.626.133s.033-3.69-.92-7.436c-.34-1.34 2.188-2.174 2.748-.184.558 1.985.809 5.002.919 6.783 1.364-1.214 2.793-.405 2.746.036-.403 3.812 2.43 6.729-.426 11.076-1.554 2.364-2.535 2.307-3.529 4.044-.522.911-.132 2.348-.132 2.348"/><path fill="#B78B60" d="M31.683 19.707c-.718.2-1.46.475-2.099.931-1.117.795-1.797 1.679-1.962 1.969-.175.298-.787.164-.525-.345.256-.494 1.099-1.432 2.093-2.11.694-.475 1.696-.875 2.597-1.114.162-.043-1.01-4.132.22-5.511-.469.848.344 4.548.344 5.161s-.286.912-.668 1.019z"/></svg>
\ No newline at end of file