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/1f38a.svg b/public/emoji/1f38a.svg
index 961ed4fb6..e709775f1 100644
--- a/public/emoji/1f38a.svg
+++ b/public/emoji/1f38a.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(26,27.0005)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.591,0 -6.27,1.648 -7.989,4.905 -9.615,1.685 -12.007,0 -15,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 2.729,0 4.765,1.957 6.051,5.816 C -8.813,8.224 -8.431,8.5 -8,8.5 -7.569,8.5 -7.187,8.224 -7.051,7.816 -5.729,3.848 -3.488,2 0,2 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(14.7113,26.3462)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.364,-3.366 0.498,-5.954 -2.868,-9.319 -3.365,-3.365 -5.953,-6.232 -9.319,-2.868 -3.366,3.366 -3.366,8.822 0,12.187 C -8.821,3.366 -3.366,3.366 0,0"/></g><g transform="translate(15.5424,25.0278)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.584,-1.585 0.248,-5.486 -2.983,-8.717 -3.231,-3.232 -7.132,-4.569 -8.717,-2.983 -1.584,1.584 -0.248,5.486 2.982,8.717 C -5.486,0.248 -1.585,1.584 0,0"/></g><g transform="translate(21.2885,26.3462)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.363,-3.366 -0.498,-5.954 2.868,-9.319 3.365,-3.365 5.954,-6.232 9.32,-2.868 3.365,3.366 3.365,8.822 0,12.187 C 8.822,3.366 3.367,3.366 0,0"/></g><g transform="translate(20.4585,25.0278)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.585,-1.585 -0.249,-5.486 2.982,-8.717 3.231,-3.232 7.133,-4.569 8.717,-2.983 1.584,1.584 0.248,5.486 -2.982,8.717 C 5.486,0.248 1.584,1.584 0,0"/></g><g transform="translate(22.4102,17.7793)" id="g40"><path id="path42" style="fill:#aa8dd8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.199,0.16 0.459,0.244 0.734,0.215 1.602,0.121 2.332,-0.181 2.844,-0.658 3.385,-1.163 3.65,-1.841 3.578,-2.52 3.449,-3.712 2.254,-4.806 0.215,-4.586 c -0.793,0.085 -1.147,-0.17 -1.158,-0.291 -0.014,-0.121 0.277,-0.446 1.07,-0.532 0.867,-0.094 1.598,-0.396 2.109,-0.873 0.541,-0.505 0.809,-1.183 0.735,-1.863 -0.129,-1.192 -1.325,-2.285 -3.362,-2.065 -0.578,0.063 -0.882,-0.057 -1.011,-0.134 -0.104,-0.063 -0.145,-0.124 -0.149,-0.158 -0.011,-0.12 0.276,-0.445 1.071,-0.531 0.548,-0.06 0.947,-0.553 0.886,-1.102 -0.058,-0.549 -0.551,-0.946 -1.101,-0.886 -2.037,0.218 -2.973,1.542 -2.844,2.735 0.129,1.192 1.324,2.285 3.363,2.065 0.578,-0.063 0.881,0.057 1.01,0.134 0.103,0.063 0.145,0.123 0.148,0.157 0.014,0.121 -0.275,0.447 -1.07,0.533 -2.037,0.219 -2.973,1.542 -2.844,2.735 0.129,1.192 1.325,2.286 3.362,2.064 0.578,-0.061 0.882,0.058 1.011,0.135 0.104,0.063 0.145,0.123 0.149,0.157 0.012,0.121 -0.278,0.447 -1.07,0.533 -0.549,0.059 -0.948,0.552 -0.887,1.101 C -0.338,-0.397 -0.199,-0.161 0,0"/></g><g transform="translate(15.2661,0.1715)" id="g44"><path id="path46" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.973,-0.557 -3.334,0.322 -3.658,1.477 -0.324,1.154 0.378,2.615 2.349,3.169 0.77,0.216 1.001,0.584 0.97,0.702 -0.034,0.119 -0.425,0.312 -1.193,0.095 -1.972,-0.555 -3.333,0.325 -3.657,1.48 -0.327,1.155 0.378,2.614 2.35,3.169 0.769,0.217 1.001,0.586 0.967,0.703 -0.033,0.116 -0.423,0.31 -1.192,0.095 -0.531,-0.15 -1.084,0.159 -1.234,0.69 -0.148,0.533 0.161,1.084 0.694,1.235 1.97,0.554 3.333,-0.323 3.659,-1.479 C 0.379,10.182 -0.324,8.723 -2.298,8.166 -3.067,7.95 -3.299,7.582 -3.265,7.465 -3.232,7.348 -2.843,7.152 -2.074,7.369 -0.101,7.925 1.26,7.047 1.585,5.89 1.91,4.736 1.207,3.277 -0.767,2.721 -1.534,2.506 -1.766,2.135 -1.733,2.02 -1.699,1.901 -1.311,1.707 -0.541,1.923 -0.009,2.074 0.542,1.764 0.692,1.233 0.842,0.701 0.532,0.149 0,0"/></g><g transform="translate(1,8.5)" id="g48"><path id="path50" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.828 0.672,1.5 1.5,1.5 2.328,1.5 3,0.828 3,0 3,-0.828 2.328,-1.5 1.5,-1.5 0.672,-1.5 0,-0.828 0,0"/></g><g transform="translate(5,5)" id="g52"><path id="path54" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.896,2 2,2 3.104,2 4,1.105 4,0 4,-1.105 3.104,-2 2,-2 0.896,-2 0,-1.105 0,0"/></g><g transform="translate(28,9)" id="g56"><path id="path58" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.896,2 2,2 3.105,2 4,1.105 4,0 4,-1.104 3.105,-2 2,-2 0.896,-2 0,-1.104 0,0"/></g><g transform="translate(24,4.5)" id="g60"><path id="path62" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.828 0.672,1.5 1.5,1.5 2.328,1.5 3,0.828 3,0 3,-0.828 2.328,-1.5 1.5,-1.5 0.672,-1.5 0,-0.828 0,0"/></g><g transform="translate(16,16.5)" id="g64"><path id="path66" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.828 0.672,1.5 1.5,1.5 2.328,1.5 3,0.828 3,0 3,-0.828 2.328,-1.5 1.5,-1.5 0.672,-1.5 0,-0.828 0,0"/></g><g transform="translate(5,13)" id="g68"><path id="path70" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.896,2 2,2 3.104,2 4,1.105 4,0 4,-1.104 3.104,-2 2,-2 0.896,-2 0,-1.104 0,0"/></g><g transform="translate(26,19.5)" id="g72"><path id="path74" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.828 0.672,1.5 1.5,1.5 2.328,1.5 3,0.828 3,0 3,-0.828 2.328,-1.5 1.5,-1.5 0.672,-1.5 0,-0.828 0,0"/></g><g transform="translate(11,21.5)" id="g76"><path id="path78" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.828 0.672,1.5 1.5,1.5 2.328,1.5 3,0.828 3,0 3,-0.828 2.328,-1.5 1.5,-1.5 0.672,-1.5 0,-0.828 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M26 9c-3.591 0-6.27-1.648-7.989-4.905C16.385 7.314 13.993 9 11 9c-.552 0-1-.448-1-1s.448-1 1-1c2.729 0 4.765-1.957 6.051-5.816C17.188.775 17.569.5 18 .5s.812.275.949.684C20.271 5.151 22.512 7 26 7c.553 0 1 .448 1 1s-.447 1-1 1z"/><path fill="#FFAC33" d="M14.711 9.654c3.364 3.366.498 5.954-2.868 9.319-3.365 3.365-5.954 6.232-9.319 2.868-3.366-3.366-3.366-8.822 0-12.187 3.366-3.366 8.821-3.366 12.187 0z"/><path fill="#BE1931" d="M15.542 10.972c1.584 1.585.248 5.486-2.983 8.717-3.231 3.231-7.132 4.568-8.717 2.982-1.584-1.584-.248-5.486 2.982-8.717 3.232-3.23 7.134-4.566 8.718-2.982z"/><path fill="#FFAC33" d="M21.289 9.654c-3.363 3.366-.498 5.954 2.868 9.319 3.365 3.365 5.954 6.232 9.319 2.868 3.365-3.366 3.365-8.822 0-12.187-3.365-3.366-8.82-3.366-12.187 0z"/><path fill="#BE1931" d="M20.459 10.972c-1.585 1.585-.249 5.486 2.982 8.717 3.23 3.231 7.133 4.568 8.717 2.982 1.584-1.584.248-5.486-2.983-8.717-3.23-3.23-7.133-4.566-8.716-2.982z"/><path fill="#AA8DD8" d="M22.41 18.221c.199-.16.459-.244.734-.215.867.094 1.598.396 2.109.873.541.505.807 1.183.734 1.862-.129 1.191-1.324 2.285-3.363 2.065-.793-.085-1.146.17-1.158.291-.014.121.277.446 1.07.532.867.094 1.598.396 2.109.873.541.505.809 1.183.734 1.862-.129 1.192-1.324 2.285-3.361 2.066-.578-.062-.883.057-1.012.134-.103.063-.144.124-.148.158-.012.12.275.445 1.07.531.549.06.947.553.887 1.102-.059.549-.551.946-1.102.887-2.037-.219-2.973-1.542-2.844-2.735.129-1.192 1.324-2.285 3.363-2.065.578.063.881-.057 1.01-.134.104-.062.145-.123.148-.157.014-.121-.275-.446-1.07-.532-2.037-.22-2.973-1.542-2.844-2.735.129-1.192 1.324-2.286 3.361-2.064.578.062.883-.058 1.012-.135.103-.062.144-.123.148-.157.012-.121-.277-.446-1.07-.532-.549-.059-.947-.553-.887-1.102.032-.276.171-.512.37-.673z"/><path fill="#77B255" d="M15.266 35.828c-1.973.557-3.334-.322-3.658-1.477-.324-1.154.378-2.615 2.35-3.17.77-.216 1.001-.584.97-.701-.034-.119-.425-.312-1.193-.096-1.972.556-3.333-.324-3.657-1.479-.326-1.155.378-2.614 2.351-3.169.769-.217 1.001-.586.967-.703-.033-.116-.423-.311-1.192-.095-.53.149-1.084-.159-1.233-.69-.148-.533.161-1.084.693-1.234 1.971-.555 3.333.322 3.659 1.479.324 1.154-.379 2.613-2.352 3.17-.77.216-1.001.584-.967.701.032.117.422.312 1.19.096 1.974-.556 3.334.322 3.659 1.479.325 1.153-.378 2.612-2.352 3.169-.768.215-.999.586-.967.701.034.118.423.312 1.192.097.532-.151 1.083.159 1.233.69.149.531-.161 1.084-.693 1.232z"/><circle fill="#5C913B" cx="2.5" cy="27.5" r="1.5"/><circle fill="#9266CC" cx="7" cy="31" r="2"/><circle fill="#9266CC" cx="30" cy="27" r="2"/><circle fill="#5C913B" cx="25.5" cy="31.5" r="1.5"/><circle fill="#5C913B" cx="17.5" cy="19.5" r="1.5"/><circle fill="#FFCC4D" cx="7" cy="23" r="2"/><circle fill="#FFCC4D" cx="27.5" cy="16.5" r="1.5"/><circle fill="#FFCC4D" cx="12.5" cy="14.5" r="1.5"/></svg>
\ No newline at end of file