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/1f92c.svg b/public/emoji/1f92c.svg
index e19b92f45..c26a5aa4e 100644
--- a/public/emoji/1f92c.svg
+++ b/public/emoji/1f92c.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,18)" id="g20"><path id="path22" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(25.4854,6.1211)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.045,0.179 -1.168,4.379 -7.485,4.379 -6.318,0 -7.441,-4.2 -7.485,-4.379 -0.055,-0.217 0.043,-0.442 0.237,-0.554 0.195,-0.109 0.439,-0.079 0.599,0.077 0.019,0.019 1.954,1.856 6.649,1.856 4.694,0 6.63,-1.837 6.648,-1.856 0.096,-0.094 0.224,-0.144 0.352,-0.144 0.084,0 0.169,0.021 0.246,0.064 C -0.043,-0.445 0.055,-0.218 0,0"/></g><g transform="translate(15.707,20.707)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.255,3.255 -8.486,3.293 -8.707,3.293 -0.552,0 -0.999,-0.447 -0.999,-0.999 -0.001,-0.551 0.446,-1 0.998,-1.001 0.029,0 1.925,-0.022 3.983,-0.737 -0.593,-0.64 -0.982,-1.634 -0.982,-2.763 0,-1.934 1.119,-3.5 2.5,-3.5 1.381,0 2.5,1.566 2.5,3.5 0,0.174 -0.019,0.34 -0.037,0.507 0.013,0 0.025,-0.007 0.037,-0.007 0.256,0 0.512,0.098 0.707,0.293 0.391,0.391 0.391,1.023 0,1.414"/></g><g transform="translate(29,24)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.221,0 -5.451,-0.038 -8.707,-3.293 -0.391,-0.391 -0.391,-1.023 0,-1.414 C -8.512,-4.902 -8.256,-5 -8,-5 c 0.013,0 0.024,0.007 0.036,0.007 C -7.98,-5.16 -8,-5.326 -8,-5.5 -8,-7.434 -6.881,-9 -5.5,-9 c 1.381,0 2.5,1.566 2.5,3.5 0,1.129 -0.389,2.123 -0.982,2.763 C -1.924,-2.022 -0.028,-2 0.002,-2 0.553,-1.999 1,-1.55 0.999,-0.999 0.998,-0.447 0.552,0 0,0"/></g><g transform="translate(29.7389,3)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.478,0 c -1.243,0 -2.261,1.017 -2.261,2.261 l 0,5.739 c 0,1.244 1.018,2.261 2.261,2.261 L 0,10.261 C 1.244,10.261 2.261,9.244 2.261,8 l 0,-5.739 C 2.261,1.017 1.244,0 0,0"/></g><g transform="translate(8.6108,7.6875)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.903,0 0.152,1.083 -0.903,0 L 0,0 Z m -0.77,1.083 -0.817,0 c -0.314,0 -0.457,0.229 -0.457,0.457 0,0.228 0.143,0.456 0.457,0.456 l 0.95,0 0.209,1.53 c 0.048,0.342 0.19,0.456 0.475,0.456 0.228,0 0.438,-0.151 0.438,-0.38 0,-0.142 0,-0.076 -0.019,-0.228 l -0.191,-1.378 0.913,0 0.209,1.53 c 0.048,0.342 0.19,0.456 0.476,0.456 0.228,0 0.437,-0.151 0.437,-0.38 0,-0.142 0,-0.076 -0.019,-0.228 l -0.19,-1.378 0.817,0 c 0.314,0 0.457,-0.228 0.457,-0.456 0,-0.228 -0.143,-0.457 -0.457,-0.457 l -0.95,0 L 1.815,0 2.633,0 c 0.314,0 0.456,-0.229 0.456,-0.457 0,-0.228 -0.142,-0.456 -0.456,-0.456 l -0.95,0 -0.209,-1.53 C 1.426,-2.786 1.283,-2.899 0.998,-2.899 c -0.228,0 -0.437,0.151 -0.437,0.379 0,0.143 0,0.077 0.019,0.229 l 0.19,1.378 -0.913,0 -0.209,-1.53 c -0.047,-0.343 -0.19,-0.456 -0.475,-0.456 -0.228,0 -0.438,0.151 -0.438,0.379 0,0.143 0,0.077 0.019,0.229 l 0.191,1.378 -0.818,0 c -0.314,0 -0.456,0.228 -0.456,0.456 0,0.228 0.142,0.457 0.456,0.457 l 0.951,0 0.152,1.083 z"/></g><g transform="translate(18.5313,6.2607)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.305 -0.181,0.57 -0.495,0.57 -0.314,0 -0.494,-0.265 -0.494,-0.57 0,-0.304 0.18,-0.561 0.494,-0.561 C -0.181,-0.561 0,-0.304 0,0 m -1.958,0 c 0,0.827 0.617,1.54 1.463,1.54 0.847,0 1.465,-0.713 1.465,-1.54 0,-0.826 -0.618,-1.53 -1.465,-1.53 -0.846,0 -1.463,0.704 -1.463,1.53 m 0.921,5.22 c 0.124,0.237 0.219,0.303 0.438,0.303 0.294,0 0.56,-0.237 0.56,-0.532 0,-0.076 0,-0.142 -0.076,-0.285 l -3.194,-5.979 c -0.142,-0.2 -0.199,-0.314 -0.427,-0.314 -0.247,0 -0.542,0.237 -0.542,0.523 0,0.142 0.057,0.275 0.095,0.351 l 3.146,5.933 z m -2.31,-1.293 c 0,0.303 -0.18,0.57 -0.494,0.57 -0.314,0 -0.494,-0.267 -0.494,-0.57 0,-0.305 0.18,-0.562 0.494,-0.562 0.314,0 0.494,0.257 0.494,0.562 m -1.958,0 c 0,0.827 0.618,1.54 1.464,1.54 0.846,0 1.464,-0.713 1.464,-1.54 0,-0.827 -0.618,-1.531 -1.464,-1.531 -0.846,0 -1.464,0.704 -1.464,1.531"/></g><g transform="translate(21.0742,11.0811)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.399 0.294,0.646 0.684,0.646 1.064,0.646 1.368,0.39 1.368,0 l 0,-3.66 C 1.368,-4.05 1.064,-4.307 0.684,-4.307 0.294,-4.307 0,-4.06 0,-3.66 L 0,0 Z m -0.058,-5.609 c 0,0.409 0.333,0.742 0.742,0.742 0.409,0 0.742,-0.333 0.742,-0.742 0,-0.409 -0.333,-0.742 -0.742,-0.742 -0.409,0 -0.742,0.333 -0.742,0.742"/></g><g transform="translate(26.376,10.8588)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.28,0 -0.67,-0.229 -0.67,-0.602 0,-0.348 0.171,-0.559 0.534,-0.929 l 0.051,-0.052 0.064,0.032 c 0.497,0.261 0.748,0.553 0.748,0.87 C 0.727,-0.212 0.351,0 0,0 m -0.671,-2.711 c -0.428,-0.287 -0.864,-0.665 -0.864,-1.291 0,-0.656 0.427,-1.079 1.089,-1.079 0.551,0 0.909,0.242 1.275,0.606 l 0.071,0.069 -1.5,1.743 -0.071,-0.048 z m 3.447,-3.474 c -0.186,0 -0.303,0.053 -0.43,0.196 L 1.622,-5.199 1.55,-5.266 C 0.848,-5.91 0.242,-6.185 -0.475,-6.185 c -1.109,0 -2.229,0.632 -2.229,2.044 0,1.107 0.867,1.769 1.384,2.065 l 0.117,0.068 -0.095,0.098 c -0.425,0.445 -0.598,0.813 -0.598,1.269 0,1.076 0.983,1.566 1.896,1.566 0.764,0 1.84,-0.452 1.84,-1.457 0,-0.951 -0.883,-1.501 -1.154,-1.647 l -0.115,-0.062 1.161,-1.341 0.445,0.536 c 0.247,0.297 0.39,0.422 0.646,0.422 0.205,0 0.424,-0.184 0.424,-0.523 0,-0.255 -0.252,-0.585 -0.499,-0.876 L 2.451,-4.358 3.157,-5.195 c 0.131,-0.156 0.185,-0.239 0.185,-0.428 0,-0.294 -0.27,-0.562 -0.566,-0.562"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DA2F47" d="M36 18c0 9.941-8.059 18-18 18-9.94 0-18-8.059-18-18C0 8.06 8.06 0 18 0c9.941 0 18 8.06 18 18"/><path fill="#292F33" d="M25.485 29.879C25.44 29.7 24.317 25.5 18 25.5c-6.318 0-7.44 4.2-7.485 4.379-.055.217.043.442.237.554.195.109.439.079.6-.077.019-.019 1.954-1.856 6.648-1.856s6.63 1.837 6.648 1.855c.096.095.224.145.352.145.084 0 .169-.021.246-.064.196-.112.294-.339.239-.557zm-9.778-14.586C12.452 12.038 7.221 12 7 12c-.552 0-.999.447-.999.998-.001.552.446 1 .998 1.002.029 0 1.925.023 3.983.737-.593.64-.982 1.634-.982 2.763 0 1.934 1.119 3.5 2.5 3.5s2.5-1.566 2.5-3.5c0-.174-.019-.34-.037-.507.013 0 .025.007.037.007.256 0 .512-.098.707-.293.391-.391.391-1.023 0-1.414zM29 12c-.221 0-5.451.038-8.707 3.293-.391.391-.391 1.023 0 1.414.195.195.451.293.707.293.013 0 .024-.007.036-.007-.016.167-.036.333-.036.507 0 1.934 1.119 3.5 2.5 3.5s2.5-1.566 2.5-3.5c0-1.129-.389-2.123-.982-2.763 2.058-.714 3.954-.737 3.984-.737.551-.002.998-.45.997-1.002-.001-.551-.447-.998-.999-.998z"/><path fill="#292F33" d="M29.739 33H6.261C5.017 33 4 31.983 4 30.739V25c0-1.244 1.017-2.261 2.261-2.261h23.478C30.983 22.739 32 23.756 32 25v5.739C32 31.983 30.983 33 29.739 33z"/><path d="M7.841 27.229h-.818c-.314 0-.457-.229-.457-.457s.143-.456.457-.456h.95l.209-1.53c.047-.342.19-.456.475-.456.228 0 .438.151.438.38 0 .143 0 .076-.019.229l-.19 1.378h.913l.209-1.53c.047-.342.19-.456.475-.456.228 0 .438.151.438.38 0 .143 0 .076-.019.229l-.191 1.378h.818c.314 0 .456.229.456.456 0 .228-.143.457-.456.457h-.951l-.152 1.083h.818c.314 0 .456.229.456.457s-.143.456-.456.456h-.951l-.209 1.53c-.048.343-.191.456-.476.456-.228 0-.438-.151-.438-.38 0-.143 0-.076.019-.229l.191-1.378h-.912l-.209 1.53c-.048.343-.19.456-.476.456-.228 0-.438-.151-.438-.38 0-.143 0-.076.019-.229l.19-1.378h-.816c-.313 0-.456-.229-.456-.456 0-.229.143-.457.456-.457h.951l.152-1.083zm.77 1.083h.903l.152-1.083h-.903l-.152 1.083zm4.616-2.5c0-.827.618-1.54 1.464-1.54s1.464.713 1.464 1.54-.618 1.531-1.464 1.531c-.847.001-1.464-.703-1.464-1.531zm1.958 0c0-.304-.181-.57-.494-.57-.314 0-.495.267-.495.57 0 .305.181.562.495.562.313 0 .494-.257.494-.562zm2.31-1.292c.124-.237.219-.304.438-.304.295 0 .561.237.561.532 0 .076 0 .143-.076.285l-3.194 5.979c-.143.199-.2.313-.428.313-.247 0-.542-.237-.542-.522 0-.143.057-.275.095-.352l3.146-5.931zm-.922 5.219c0-.827.618-1.54 1.464-1.54s1.464.713 1.464 1.54c0 .826-.618 1.53-1.464 1.53-.847.001-1.464-.704-1.464-1.53zm1.958 0c0-.305-.181-.57-.495-.57s-.495.266-.495.57c0 .304.181.561.495.561s.495-.257.495-.561zm2.486.789c0-.409.333-.742.741-.742.409 0 .742.333.742.742 0 .408-.333.741-.742.741-.408.001-.741-.332-.741-.741zm.057-5.609c0-.399.294-.646.684-.646.381 0 .685.257.685.646v3.66c0 .39-.304.646-.685.646-.39 0-.684-.247-.684-.646v-3.66zm8.078 6.407c-.187 0-.304-.053-.431-.196l-.724-.79-.072.066c-.702.645-1.308.919-2.024.919-1.109 0-2.229-.632-2.229-2.044 0-1.107.867-1.769 1.384-2.065l.117-.067-.095-.098c-.425-.445-.599-.813-.599-1.269 0-1.077.983-1.567 1.896-1.567.764 0 1.84.453 1.84 1.458 0 .951-.883 1.501-1.153 1.647l-.115.062 1.161 1.341.444-.536c.247-.297.391-.422.646-.422.205 0 .424.184.424.523 0 .254-.252.585-.499.875l-.297.335.706.838c.131.156.185.239.185.428.001.295-.269.562-.565.562zm-3.447-3.474c-.428.287-.864.665-.864 1.291 0 .656.427 1.079 1.089 1.079.552 0 .909-.242 1.275-.606l.071-.069-1.5-1.743-.071.048zm.671-2.711c-.28 0-.67.229-.67.602 0 .348.171.56.534.929l.051.052.063-.033c.497-.26.749-.553.749-.869.001-.468-.376-.681-.727-.681z" fill="#FFF"/></svg>
\ No newline at end of file