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/1f919-1f3fb.svg b/public/emoji/1f919-1f3fb.svg
index 231703d30..1a9691f90 100644
--- a/public/emoji/1f919-1f3fb.svg
+++ b/public/emoji/1f919-1f3fb.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(1.7891,20.144)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.478,2.63 3.772,4.847 6.111,5.917 3.658,1.672 5.169,7.582 6.211,9.049 1.447,2.038 4.373,0.166 3.889,-2.864 C 15.689,8.837 14.268,8.049 13.407,6.082 12.969,5.078 13.11,4.368 14.963,4.234 16.817,4.101 21.959,3.6 22.212,2.587 c 0.616,-2.463 -7.787,-8.445 -0.978,-13.534 0,0 8.662,-1.651 10.41,-1.908 3.026,-0.445 2.48,-4.531 -0.675,-4.196 -2.972,0.314 -10.24,1.826 -12.477,0.435 -1.796,-1.116 -8.495,-2.609 -14.445,0.735 C -1.903,-12.538 -3.029,-5.39 0,0"/></g><g transform="translate(14.0986,10.1006)" id="g24"><path id="path26" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.156,0.865 -3.689,5.886 0.27,5.569 3.49,5.312 9.116,4.334 10.522,4.017 13.399,3.368 12.761,-1.643 9.363,-1.232 7.157,-0.967 3.234,-0.673 0,0"/></g><g transform="translate(14.521,11.0244)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.449,0.795 -2.49,4.429 0.734,4.244 3.959,4.06 8.874,3.314 10.297,3.085 13.624,2.551 12.127,-1.721 9.676,-1.374 7.226,-1.027 2.572,-0.593 0,0"/></g><g transform="translate(13.1919,13.9961)" id="g32"><path id="path34" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.943,0.069 -4.674,5.581 -0.974,6.013 2.234,6.389 9.306,5.595 10.748,5.535 13.431,5.424 13.45,0.521 10.403,0.359 7.931,0.23 2.64,-0.037 0,0"/></g><g transform="translate(13.0464,14.9336)" id="g36"><path id="path38" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.074,-0.141 -3.422,4.014 -0.207,4.315 3.009,4.617 9.882,4.545 11.324,4.521 13.831,4.481 13.743,0.287 10.663,0.17 8.19,0.075 2.637,0.12 0,0"/></g><g transform="translate(12.7778,18.2642)" id="g40"><path id="path42" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.447,-0.518 -4.57,5.147 -1.359,5.491 3.176,5.976 5.238,5.251 5.562,5.326 8.321,5.966 10.728,5.885 11.223,4.467 11.646,3.255 10.842,1.264 9.251,1.056 6.798,0.735 2.622,0.306 0,0"/></g><g transform="translate(12.959,19.1421)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.067,-0.249 -3.845,3.611 -0.683,4.266 2.48,4.922 7.007,5.276 8.843,5.357 11.653,5.481 12.15,1.391 9.103,0.934 6.655,0.566 3.12,0.252 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M1.789 15.856c1.478-2.63 3.772-4.847 6.111-5.917 3.657-1.673 5.169-7.582 6.211-9.05C15.558-1.148 18.484.724 18 3.754c-.522 3.265-1.943 4.053-2.804 6.021-.438 1.004-.297 1.713 1.556 1.847 1.854.134 6.996.634 7.249 1.647.616 2.464-7.787 8.445-.978 13.534 0 0 8.661 1.651 10.409 1.908 3.026.445 2.481 4.531-.675 4.196-2.972-.314-10.24-1.826-12.477-.436-1.796 1.116-8.495 2.609-14.445-.734-5.949-3.342-7.075-10.491-4.046-15.881z"/><path fill="#E0AA94" d="M14.099 25.899c-4.156-.865-3.689-5.886.27-5.569 3.22.257 8.846 1.235 10.252 1.553 2.877.649 2.238 5.659-1.159 5.249-2.206-.266-6.129-.56-9.363-1.233z"/><path fill="#F7DECE" d="M14.521 24.976c-3.449-.795-2.49-4.429.734-4.244 3.225.185 8.139.931 9.563 1.159 3.326.534 1.829 4.806-.621 4.459s-7.104-.782-9.676-1.374z"/><path fill="#E0AA94" d="M13.192 22.004c-4.943-.069-4.674-5.581-.974-6.013 3.208-.375 10.28.419 11.722.478 2.683.111 2.702 5.015-.345 5.176-2.472.129-7.763.396-10.403.359z"/><path fill="#F7DECE" d="M13.046 21.066c-3.074.141-3.422-4.014-.207-4.315 3.215-.302 10.089-.23 11.53-.206 2.508.041 2.419 4.234-.661 4.352-2.472.094-8.025.049-10.662.169z"/><path fill="#E0AA94" d="M12.778 17.736c-4.447.518-4.57-5.147-1.359-5.491 4.535-.485 6.597.24 6.921.165 2.759-.64 5.166-.559 5.661.859.423 1.212-.381 3.204-1.972 3.411-2.453.32-6.629.75-9.251 1.056z"/><path fill="#F7DECE" d="M12.959 16.858c-3.067.248-3.845-3.611-.683-4.266 3.163-.656 7.689-1.01 9.525-1.091 2.811-.125 3.308 3.966.26 4.423-2.447.368-5.982.681-9.102.934z"/></svg>
\ No newline at end of file