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-1f3fb-200d-1f3a8.svg b/public/emoji/1f468-1f3fb-200d-1f3a8.svg
index b884ed15d..c52490973 100644
--- a/public/emoji/1f468-1f3fb-200d-1f3a8.svg
+++ b/public/emoji/1f468-1f3fb-200d-1f3a8.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,0 36,0 36,36 0,36 0,0 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(30,8)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.641,0 0,3.71 -8.719,0 0,-3.71 -3.64,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 0,2 C 6,-2.686 3.315,0 0,0"/></g><g transform="translate(17.6318,10.0273)" id="g24"><path id="path26" style="fill:#eec2ad;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="g28"><path id="path30" style="fill:#f7dece;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="g32"><path id="path34" style="fill:#f7dece;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="g36"><path id="path38" style="fill:#f7dece;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(26.5254,14.6543)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.268,0.274 c -0.405,0.094 -1.173,0.072 -1.536,0.072 l -1.721,0 -1.967,0 c -0.363,0 -1.131,0.022 -1.536,-0.072 L -9.294,0 c -0.349,-0.101 -0.55,-0.393 -0.451,-0.74 0.082,-0.288 0.346,-0.441 0.631,-0.441 0.059,0 0.119,0.027 0.179,0.042 l 1.267,0.371 c -0.143,-0.191 -0.181,-0.446 -0.066,-0.675 0.115,-0.229 0.346,-0.361 0.586,-0.361 0.099,0 0.2,0.025 0.293,0.072 l 1.035,0.517 c 0.022,-0.215 0.138,-0.414 0.345,-0.517 0.094,-0.046 0.196,-0.07 0.293,-0.07 0.242,0 0.473,0.134 0.587,0.364 l 0.07,0.137 -0.053,-0.137 c 0.114,-0.23 0.223,-0.364 0.465,-0.364 0.097,0 0.198,0.024 0.292,0.07 0.207,0.103 0.323,0.302 0.346,0.517 l 1.034,-0.517 c 0.094,-0.047 0.195,-0.072 0.293,-0.072 0.241,0 0.471,0.132 0.586,0.361 0.115,0.229 0.077,0.484 -0.065,0.675 l 1.266,-0.371 c 0.059,-0.015 0.121,-0.042 0.18,-0.042 0.285,0 0.547,0.153 0.63,0.441 C 0.549,-0.393 0.348,-0.101 0,0"/></g><g transform="translate(22,32.5205)" id="g44"><path id="path46" style="fill:#292f33;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="g48"><path id="path50" style="fill:#662113;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="g52"><path id="path54" style="fill:#662113;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="g56"><path id="path58" style="fill:#c1694f;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><g transform="translate(24.7549,35.1172)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.214,-1.001 -2.751,-2.751 -0.537,-1.75 0.188,-0.586 0.917,0 0.729,0.586 2.031,1.61 2.751,1.834 C 1.637,-0.693 0.699,0 0,0"/></g><g transform="translate(23.8379,33.7417)" id="g64"><path id="path66" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.13,0 8.71,-1.971 9.177,-4.127 0.511,-2.365 -0.93,-2.533 -0.93,-2.533 0,0 -0.134,-1.341 -1.006,-1.106 -1.416,0.381 -4.409,0.437 -9.919,0.888 -5.509,0.452 -7.949,0.051 -7.949,0.051 0,0 -0.898,0.083 -0.938,0.938 -0.041,0.855 -1.098,-0.159 -1.273,0.845 C -13.014,-4.039 -7.24,0 0,0"/></g><g transform="translate(27.4697,0)" id="g68"><path id="path70" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.279,3.867 -4.091,7.954 -9.64,9.879 -16.342,12.205 -23.023,10.493 -24.563,6.056 -25.234,4.12 -24.815,1.985 -23.574,0 L 0,0 Z"/></g><g transform="translate(19.7822,4.6182)" id="g72"><path id="path74" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.3,-0.862 0.363,-1.876 1.48,-2.264 2.598,-2.65 3.746,-2.266 4.045,-1.402 4.345,-0.541 3.682,0.474 2.564,0.86 1.447,1.248 0.299,0.863 0,0"/></g><g transform="translate(5.4009,2.999)" id="g76"><path id="path78" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.299,-0.863 0.364,-1.876 1.481,-2.264 2.598,-2.651 3.746,-2.267 4.045,-1.403 4.345,-0.541 3.682,0.473 2.565,0.86 1.448,1.248 0.299,0.863 0,0"/></g><g transform="translate(7.249,7.9795)" id="g80"><path id="path82" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.299,-0.862 0.364,-1.876 1.481,-2.264 2.597,-2.65 3.746,-2.266 4.045,-1.402 4.345,-0.541 3.681,0.474 2.565,0.86 1.448,1.248 0.299,0.863 0,0"/></g><g transform="translate(14.2764,7.9951)" id="g84"><path id="path86" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.272,-0.872 0.423,-1.864 1.552,-2.216 2.68,-2.568 3.816,-2.146 4.088,-1.275 4.359,-0.403 3.664,0.589 2.536,0.94 1.408,1.293 0.272,0.871 0,0"/></g><g transform="translate(1,6)" id="g88"><path id="path90" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.078,1.208 1.394,3.184 3,3 4.665,2.81 3.129,-0.129 3,-1 2.871,-1.871 3.144,-3.938 2,-4 0.454,-4.084 -0.14,-2.186 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M30 28h-3.641v-3.71h-8.72V28H14c-3.313 0-6 2.686-6 6v2h28v-2c0-3.314-2.685-6-6-6z"/><path fill="#EEC2AD" 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="#F7DECE" 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="#F7DECE" 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="#292F33" d="M26.525 21.346l-1.268-.274c-.404-.094-1.173-.072-1.535-.072h-3.689c-.362 0-1.131-.022-1.536.071l-1.266.274c-.348.101-.55.393-.45.74.082.288.345.441.63.441.059 0 .12-.026.18-.042l1.267-.371c-.143.191-.181.446-.066.676.115.228.347.36.587.36.099 0 .199-.024.293-.071l1.034-.518c.022.215.139.414.346.518.094.046.195.069.293.069.241 0 .473-.134.587-.363l.068-.138-.053.138c.114.229.224.363.465.363.098 0 .198-.023.292-.069.207-.104.323-.303.347-.518l1.033.518c.095.047.195.071.293.071.241 0 .472-.132.587-.36.114-.229.076-.484-.066-.676l1.266.371c.059.016.121.042.181.042.285 0 .547-.152.63-.441.099-.347-.102-.639-.45-.739zM22 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="#662113" 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="#C1694F" 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="#66757F" d="M33.015 6.385c-.439-2.026-3.627-3.888-8.267-4.105.346-.222.672-.402.924-.48.72-.224-.218-.917-.917-.917 0 0-1.092.505-1.93 1.41C16.069 2.641 10.832 6.344 11 7.302c.175 1.004 1.232-.01 1.273.845.04.855.938.938.938.938s2.44-.401 7.949.051c5.51.451 8.503.507 9.919.888.872.235 1.006-1.106 1.006-1.106s1.44-.168.93-2.533z"/><path fill="#D99E82" d="M27.47 36c-.279-3.867-4.091-7.954-9.64-9.879-6.702-2.326-13.383-.614-14.923 3.823-.671 1.936-.252 4.071.989 6.056H27.47z"/><path fill="#5C913B" d="M19.782 31.382c-.3.862.363 1.876 1.48 2.264 1.117.387 2.266.002 2.564-.861.3-.861-.363-1.876-1.48-2.263-1.117-.388-2.265-.003-2.564.86"/><path fill="#269" d="M5.401 33.001c-.299.863.364 1.876 1.481 2.264 1.117.388 2.265.003 2.564-.86.3-.862-.363-1.876-1.48-2.264-1.117-.388-2.266-.003-2.565.86"/><path fill="#DD2E44" d="M7.249 28.021c-.299.862.364 1.876 1.481 2.264 1.116.387 2.265.002 2.564-.861.3-.861-.364-1.876-1.48-2.263-1.117-.389-2.266-.004-2.565.86"/><path fill="#FFCC4D" d="M14.276 28.005c-.272.872.423 1.864 1.552 2.216 1.128.353 2.265-.069 2.536-.94.271-.872-.424-1.864-1.552-2.216-1.128-.353-2.264.069-2.536.94"/><path fill="#F7DECE" d="M1 30c.078-1.208 1.394-3.184 3-3 1.665.19.129 3.129 0 4s.144 2.938-1 3c-1.546.084-2.14-1.814-2-4"/></svg>
\ No newline at end of file