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/1f468-1f3fe-200d-1f33e.svg b/public/emoji/1f468-1f3fe-200d-1f33e.svg
index 96a2bf5bf..48a941a6e 100644
--- a/public/emoji/1f468-1f3fe-200d-1f33e.svg
+++ b/public/emoji/1f468-1f3fe-200d-1f33e.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,0)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(22,2)" id="g24"><path id="path26" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.767,0 5,3 5,6 L -5,6 C -5,3 -0.767,0 0,0"/></g><g transform="translate(17.6396,7.9619)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.846 8.72,-2.962 8.72,0 l 0,3.749 L 0,3.749 0,0 Z"/></g><g transform="translate(17.6318,10.0273)" id="g32"><path id="path34" style="fill:#9b6a49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(15.4443,20.0645)" id="g36"><path id="path38" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g40"><path id="path42" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(13.4775,19.0405)" id="g44"><path id="path46" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.522,-4.532 8.522,-10.121 0,-5.589 -3.815,-10.121 -8.522,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(22,12.1982)" id="g48"><path id="path50" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(22,32.5205)" id="g52"><path id="path54" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(18,19)" id="g56"><path id="path58" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(26,19)" id="g60"><path id="path62" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22.75,16.25)" id="g64"><path id="path66" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><path id="path68" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,0 -3,0 0,8 3,0 0,-8 z"/><path id="path70" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,0 -3,0 0,8 3,0 0,-8 z"/><path id="path72" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,1 -17.875,0 0,-1 L 31,0 31,1 Z"/><g transform="translate(30,27.2002)" id="g74"><path id="path76" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.32 -3.092,-2.2 -8,-2.2 -4.909,0 -8,0.88 -8,2.2 0,3.546 4,8.8 5.333,8.8 1.334,0 2.223,-1.76 2.667,-1.76 0.444,0 1.333,1.76 2.667,1.76 C -4,8.8 0,3.546 0,0"/></g><g transform="translate(35.9414,28)" id="g78"><path id="path80" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -3.5,-6 -14,-6 -10.5,0 -14,4.343 -14,6 0,1.657 6.82,1 14,1 7.18,0 14,0.657 14,-1"/></g><g transform="translate(30,27.2002)" id="g82"><path id="path84" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.32 -3.092,-2.2 -8,-2.2 -4.909,0 -8,0.88 -8,2.2 0,0.566 0.102,1.175 0.279,1.8 2.388,-2 13.054,-2 15.443,-0.005 C -0.102,1.172 0,0.564 0,0"/></g><g transform="translate(7,4.25)" id="g86"><path id="path88" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.69 -0.56,1.25 -1.25,1.25 -1.94,1.25 -2.5,0.69 -2.5,0 l 0,-4.25 2.5,0 L 0,0 Z"/></g><g transform="translate(10.0029,13.25)" id="g90"><path id="path92" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.35 -1.904,-4.253 -4.253,-4.253 -2.349,0 -4.253,1.903 -4.253,4.253 0,0.086 -1.497,0.084 -1.497,0 0,-3.176 2.575,-5.75 5.75,-5.75 3.175,0 5.75,2.574 5.75,5.75 C 1.497,0.084 0,0.086 0,0"/></g><g transform="translate(1.5,13.25)" id="g94"><path id="path96" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 l 0,8.5 c 0,0.414 0.336,0.75 0.75,0.75 C -0.336,9.25 0,8.914 0,8.5 L 0,0 Z"/></g><g transform="translate(11.5,13.25)" id="g98"><path id="path100" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 l 0,8.5 c 0,0.414 0.336,0.75 0.75,0.75 C -0.336,9.25 0,8.914 0,8.5 L 0,0 Z"/></g><g transform="translate(6.5,5)" id="g102"><path id="path104" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -0.336,-0.75 -0.75,-0.75 -0.414,0 -0.75,0.336 -0.75,0.75 l 0,16.75 c 0,0.414 0.336,0.75 0.75,0.75 C -0.336,17.5 0,17.164 0,16.75 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M36 36v-2c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#3E721D" d="M22 34c.767 0 5-3 5-6H17c0 3 4.233 6 5 6z"/><path fill="#AF7E57" d="M17.64 28.038c0 2.846 8.72 2.962 8.72 0v-3.749h-8.72v3.749z"/><path fill="#9B6A49" d="M17.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#AF7E57" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#AF7E57" d="M13.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 27.08 22 27.08c-4.706 0-8.523-4.531-8.523-10.121"/><path fill="#915A34" d="M22 23.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848"/><path fill="#60352A" d="M22 3.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C12.822 7.648 15.646 3.48 22 3.48"/><path fill="#60352A" d="M18 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#915A34" d="M22.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#3B88C3" d="M13 28h3v8h-3zm15 0h3v8h-3z"/><path fill="#3B88C3" d="M13.125 35H31v1H13.125z"/><path fill="#C1694F" d="M30 8.8c0 1.32-3.092 2.2-8 2.2-4.909 0-8-.88-8-2.2C14 5.253 18 0 19.333 0 20.667 0 21.556 1.76 22 1.76S23.333 0 24.667 0C26 0 30 5.253 30 8.8z"/><path fill="#C1694F" d="M35.941 8c0 1.657-3.5 6-14 6s-14-4.343-14-6 6.82-1 14-1 14-.657 14 1z"/><path fill="#292F33" d="M30 8.8c0 1.32-3.092 2.2-8 2.2-4.909 0-8-.88-8-2.2 0-.566.102-1.175.279-1.8 2.388 2 13.054 2 15.443.004.175.623.278 1.231.278 1.796z"/><path fill="#C1694F" d="M7 31.75c0-.69-.56-1.25-1.25-1.25s-1.25.56-1.25 1.25V36H7v-4.25z"/><path fill="#66757F" d="M10.003 22.75c0 2.35-1.904 4.253-4.253 4.253S1.497 25.1 1.497 22.75c0-.086-1.497-.084-1.497 0 0 3.176 2.575 5.75 5.75 5.75s5.75-2.574 5.75-5.75c0-.084-1.497-.086-1.497 0z"/><path fill="#66757F" d="M1.5 22.75c0 .414-.336.75-.75.75S0 23.164 0 22.75v-8.5c0-.414.336-.75.75-.75s.75.336.75.75v8.5zm10 0c0 .414-.336.75-.75.75s-.75-.336-.75-.75v-8.5c0-.414.336-.75.75-.75s.75.336.75.75v8.5zM6.5 31c0 .414-.336.75-.75.75S5 31.414 5 31V14.25c0-.414.336-.75.75-.75s.75.336.75.75V31z"/></svg>
\ No newline at end of file