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/1f3c4-1f3ff.svg b/public/emoji/1f3c4-1f3ff.svg
index 5c4f2a5e4..292c60956 100644
--- a/public/emoji/1f3c4-1f3ff.svg
+++ b/public/emoji/1f3c4-1f3ff.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(36,31)" id="g20"><path id="path22" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-27 c 0,0 0,-4 -4,-4 l -28,0 c -4,0 -4,4 -4,4 l 0,5 c 0,0 25,2 36,22"/></g><g transform="translate(30.5898,15.5684)" id="g24"><path id="path26" style="fill:#a7d28b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2.33,2.136 1.924,3.049 1.516,3.963 -9.752,2.218 -15.23,-0.228 c -8.22,-3.668 -12.068,-9.766 -11.253,-11.592 0.816,-1.827 7.925,-3.034 16.143,0.634 C -4.859,-8.74 3.961,-1.517 3.555,-0.604 3.146,0.309 0,0 0,0"/></g><g transform="translate(34.1445,14.9648)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.408,0.913 -3.555,0.604 -3.555,0.604 0,0 2.204,2.024 1.943,2.972 l -27.92,-12.215 c -0.569,-1.116 -0.747,-2.037 -0.506,-2.578 0.211,-0.472 0.85,-0.9 1.812,-1.217 L -0.011,-0.089 C -0.011,-0.061 0.01,-0.02 0,0"/></g><g transform="translate(24.4082,21)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.401,0 -6.462,3.95 -6.8,4.4 -7.131,4.841 -7.042,5.467 -6.601,5.799 -6.159,6.13 -5.534,6.042 -5.2,5.601 -4.446,4.599 -2.042,2 0,2 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(7.4082,17)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.419,0 -0.809,0.265 -0.949,0.684 -1.195,3.584 0.152,5.933 1.492,7.273 1.401,1.401 3.07,1.968 3.141,1.992 0.525,0.176 1.09,-0.11 1.265,-0.633 C 5.123,8.794 4.841,8.229 4.319,8.052 3.803,7.876 -0.676,6.191 0.949,1.316 1.124,0.792 0.84,0.226 0.316,0.052 0.211,0.017 0.104,0 0,0"/></g><g transform="translate(25.4063,10)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.3,0 -0.605,0.067 -0.893,0.211 l -2,1 c -0.438,0.22 -0.78,0.592 -0.962,1.046 l -1.682,4.204 -4.204,1.682 c -1.026,0.41 -1.525,1.574 -1.114,2.6 0.409,1.026 1.575,1.525 2.599,1.114 l 5.001,-2 c 0.508,-0.203 0.91,-0.606 1.114,-1.114 l 1.717,-4.294 1.32,-0.66 C 1.885,3.295 2.285,2.094 1.791,1.105 1.44,0.404 0.734,0 0,0"/></g><g transform="translate(16.4092,6)" id="g44"><path id="path46" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.733,-0.001 -1.44,0.404 -1.79,1.105 l -1,2 c -0.199,0.398 -0.26,0.851 -0.172,1.288 l 0.848,4.241 -2.602,4.337 c -0.569,0.947 -0.262,2.175 0.686,2.744 0.946,0.569 2.175,0.261 2.743,-0.686 l 3,-5 C 1.97,9.602 2.057,9.096 1.96,8.607 L 1.094,4.28 1.788,2.895 C 2.281,1.906 1.881,0.705 0.893,0.211 0.606,0.067 0.301,0 0,0"/></g><g transform="translate(14.7552,35.2373)" id="g48"><path id="path50" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.678,0.66 -4.294,-0.192 -4.598,-2.152 -0.302,-1.947 0.252,-5.001 1.962,-4.816 1.793,0.194 3.633,0.584 4.359,2.43 C 2.45,-2.692 1.678,-0.66 0,0"/></g><g transform="translate(16.0017,30.2236)" id="g52"><path id="path54" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.442,2.869 -3.441,2.589 -3.441,2.589 -1.113,-0.04 -0.347,-1.895 -0.871,-2.908 -0.359,-0.701 1.153,-1.073 1.153,-1.073 0,0 0.695,0.011 0.732,-0.832 l 0,-0.007 c 0.008,-0.215 -0.014,-0.47 -0.114,-0.81 -0.498,-1.686 1.766,-2.72 2.263,-1.03 0.197,0.668 0.121,1.256 0.021,1.799 l -0.009,0.048 C -0.417,-1.417 -0.604,-0.709 0,0"/></g><g transform="translate(18.4082,28)" id="g56"><path id="path58" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.672,0 -3.424,-0.766 -4.848,0 -7,0 c -1.104,0 -2,-0.896 -2,-2 0,-1.104 0.896,-2 2,-2 l 0,-3.5 c 0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 L 0,-4 c 1.104,0 2,0.896 2,2 0,1.104 -0.896,2 -2,2"/></g><g transform="translate(16.6725,34.5608)" id="g60"><path id="path62" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.117,1.308 -2.654,1.851 -5.287,0.833 -2.3,-0.889 -1.439,-2.865 -1.024,-2.404 0.661,0.733 1.555,0.508 1.555,0.508 l 0.695,-2.047 c 0,0 0.332,-0.199 0.469,0.497 0.138,0.697 1.072,0.768 1.378,0.209 0.477,-0.87 -0.146,-1.037 -0.203,-1.558 -0.18,-1.645 1.643,-1.582 1.643,-1.582 0,0 0.354,-0.14 0.961,1.054 C 0.793,-3.295 1.11,-1.299 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M36 5v27s0 4-4 4H4c-4 0-4-4-4-4v-5s25-2 36-22z"/><path fill="#A7D28B" d="M30.59 20.432s2.33-2.136 1.924-3.049c-.408-.914-11.676.831-17.154 3.276-8.22 3.669-12.068 9.767-11.253 11.593.815 1.826 7.925 3.033 16.143-.635 5.48-2.445 14.301-9.669 13.895-10.582-.409-.913-3.555-.603-3.555-.603z"/><path fill="#F5F8FA" d="M34.145 21.035c-.408-.913-3.555-.604-3.555-.604s2.204-2.024 1.942-2.973L4.612 29.674c-.569 1.116-.747 2.037-.505 2.578.211.473.849.9 1.812 1.217l28.215-12.345c0-.027.02-.068.011-.089z"/><path fill="#7C533E" d="M24.408 15c-3.401 0-6.462-3.95-6.8-4.4-.332-.441-.242-1.067.199-1.399.441-.331 1.066-.244 1.4.198.754 1.002 3.158 3.601 5.2 3.601.553 0 1 .448 1 1s-.446 1-.999 1zm-17 4c-.419 0-.809-.265-.949-.684-1.195-3.584.152-5.934 1.492-7.273 1.401-1.401 3.07-1.968 3.141-1.992.525-.176 1.091.109 1.265.632.174.523-.107 1.088-.629 1.264-.516.176-4.996 1.861-3.371 6.736.175.524-.108 1.091-.632 1.265-.105.035-.212.052-.317.052z"/><path fill="#67757F" d="M25.406 26c-.3 0-.605-.067-.893-.211l-2-1c-.439-.22-.78-.592-.963-1.046l-1.682-4.204-4.204-1.682c-1.025-.41-1.524-1.574-1.114-2.6.41-1.026 1.576-1.525 2.6-1.114l5.001 2c.508.203.91.606 1.114 1.114l1.717 4.294 1.32.66c.988.494 1.389 1.695.895 2.684-.35.701-1.056 1.105-1.791 1.105z"/><path fill="#67757F" d="M16.409 30c-.733.001-1.44-.404-1.791-1.105l-1-2c-.199-.397-.259-.851-.172-1.287l.848-4.241-2.602-4.337c-.568-.947-.261-2.175.686-2.744.946-.569 2.175-.261 2.744.686l3 4.999c.256.427.344.934.246 1.422l-.865 4.327.693 1.386c.494.988.093 2.189-.895 2.684-.286.143-.591.21-.892.21z"/><path fill="#7C533E" d="M14.755.763c-1.678-.66-4.294.192-4.598 2.152-.302 1.947.252 5 1.962 4.816 1.793-.194 3.632-.584 4.359-2.43.727-1.846-.045-3.878-1.723-4.538z"/><path fill="#7C533E" d="M16.002 5.776c2.442-2.869-3.441-2.589-3.441-2.589-1.113.04-.347 1.895-.871 2.908-.359.701 1.153 1.073 1.153 1.073s.694-.01.732.832v.008c.008.214-.014.469-.114.81-.498 1.686 1.766 2.72 2.264 1.03.197-.669.12-1.257.021-1.799L15.736 8c-.151-.807-.338-1.514.266-2.224z"/><path fill="#67757F" d="M18.408 8h-2.672l-.751.766L13.56 8h-2.152c-1.104 0-2 .896-2 2s.896 2 2 2v3.5c0 1.933 1.567 3.5 3.5 3.5s3.5-1.567 3.5-3.5V12c1.104 0 2-.896 2-2s-.895-2-2-2z"/><path fill="#0B0200" d="M16.673 1.439C15.556.131 14.019-.412 11.386.606c-2.299.889-1.439 2.865-1.024 2.404.661-.734 1.555-.509 1.555-.509l.695 2.048s.331.199.469-.498c.138-.696 1.072-.768 1.378-.208.476.87-.147 1.037-.204 1.557-.179 1.645 1.643 1.582 1.643 1.582s.355.14.961-1.055c.606-1.192.923-3.189-.186-4.488z"/></svg>
\ No newline at end of file