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/1f44a-1f3fc.svg b/public/emoji/1f44a-1f3fc.svg
index a24a0a105..54cdf858a 100644
--- a/public/emoji/1f44a-1f3fc.svg
+++ b/public/emoji/1f44a-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(32.9424,24.7559)" id="g20"><path id="path22" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.041,0.609 -0.284,1.18 -0.674,1.644 L -1.03,3.701 C -1.406,5.707 -3.263,7.087 -5.292,6.87 L -28.684,3.134 c -1.882,-0.201 -3.35,-1.722 -3.484,-3.611 l 1.76,-11.146 c 0.305,-2.169 2.152,-3.788 4.341,-3.814 0.677,-0.007 1.238,-0.016 1.463,-0.027 l 9.483,-0.463 c -0.362,-0.483 -0.821,-1.08 -0.821,-1.718 l 0,-0.051 c 0,-1.581 1.771,-3.06 3.352,-3.06 l 7.282,0 c 0.76,0 1.489,0.401 2.026,0.938 l 4.424,4.471 c 0.583,0.584 0.886,1.416 0.832,2.24 L 0,0 Z"/></g><g transform="translate(8.2168,9.377)" id="g24"><path id="path26" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.474,0 -0.895,0.338 -0.983,0.821 l -2.06,11.332 c -0.099,0.544 0.262,1.064 0.805,1.163 0.547,0.097 1.064,-0.262 1.163,-0.805 L 0.985,1.179 C 1.083,0.636 0.723,0.115 0.18,0.017 0.119,0.005 0.059,0 0,0"/></g><g transform="translate(14.3979,9.377)" id="g28"><path id="path30" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.518,0 -0.956,0.398 -0.996,0.923 l -1.03,13.393 c -0.043,0.551 0.369,1.031 0.92,1.074 0.549,0.044 1.031,-0.371 1.074,-0.921 L 0.998,1.077 C 1.041,0.526 0.628,0.045 0.078,0.003 0.052,0.001 0.025,0 0,0"/></g><g transform="translate(21.6055,8.2715)" id="g32"><path id="path34" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.508,0 -0.757,0.001 -0.951,1.062 l -0.044,0.002 c 0.001,0.055 0.007,0.109 0.016,0.162 -0.173,1.068 -0.308,3.069 -0.56,6.817 -0.235,3.49 -0.486,7.552 -0.486,8.485 0,0.552 0.447,1 1,1 0.552,0 1,-0.448 1,-1 C -0.025,14.995 0.77,3.204 0.956,1.383 0.988,1.286 1.005,1.183 1.005,1.075 1.005,0.81 0.897,0.518 0.71,0.331 0.522,0.143 0.266,0 0,0"/></g><g transform="translate(25.1777,7.3164)" id="g36"><path id="path38" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.658,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 c 1.458,0 2.644,1.186 2.644,2.644 l 0,12.839 c 0,0.552 0.447,1 1,1 0.552,0 1,-0.448 1,-1 l 0,-12.839 C 4.644,2.083 2.561,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" d="M32.942 11.244c-.041-.609-.284-1.18-.674-1.644l-.357-2.057c-.376-2.006-2.232-3.386-4.262-3.169L4.259 8.11C2.377 8.312.909 9.833.774 11.721l1.761 11.147c.305 2.169 2.151 3.788 4.341 3.813.677.008 1.238.017 1.463.027l9.483.463c-.363.483-.822 1.08-.822 1.718v.052c0 1.581 1.771 3.06 3.353 3.06h7.282c.76 0 1.488-.4 2.025-.938l4.424-4.472c.583-.584.887-1.416.832-2.24l-1.974-13.107z"/><path fill="#D2A077" d="M8.217 26.623c-.474 0-.895-.338-.983-.821L5.174 14.47c-.099-.543.262-1.064.805-1.163.546-.097 1.064.262 1.163.805l2.06 11.332c.099.543-.262 1.063-.805 1.162-.061.012-.121.017-.18.017zm6.181 0c-.517 0-.955-.398-.996-.923l-1.03-13.393c-.043-.551.37-1.031.92-1.074.549-.044 1.031.371 1.074.92l1.03 13.392c.043.551-.37 1.032-.92 1.074-.026.003-.053.004-.078.004zm7.207 1.106c-.508 0-.757-.001-.951-1.062l-.044-.003c.001-.055.007-.108.017-.161-.174-1.068-.309-3.069-.561-6.817-.235-3.49-.486-7.552-.486-8.485 0-.552.447-1 1-1 .553 0 1 .448 1 1 0 1.533.795 13.324.981 15.145.032.097.049.2.049.308 0 .266-.108.557-.295.744s-.444.331-.71.331z"/><path fill="#D2A077" d="M25.178 28.684H18.52c-.552 0-1-.447-1-1s.448-1 1-1h6.658c1.458 0 2.644-1.186 2.644-2.644V11.201c0-.552.447-1 1-1s1 .448 1 1V24.04c-.001 2.561-2.084 4.644-4.644 4.644z"/></svg>
\ No newline at end of file