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/1f36c.svg b/public/emoji/1f36c.svg
index d12a6545a..f6fbf3b70 100644
--- a/public/emoji/1f36c.svg
+++ b/public/emoji/1f36c.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="m 22.795,7.428 0.398,-3.055 c 0.532,-4.074 5.629,-4.3 6.249,-2.126 l 0,0 0.933,4.042 4.041,0.933 c 2.174,0.62 1.949,5.717 -2.125,6.248 l 0,0 -3.055,0.399 c -0.324,0.042 -0.64,0.063 -0.948,0.063 l 0,0 c -3.565,0 -5.982,-2.754 -5.493,-6.504"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" d="M 7.051,34.587 6.116,30.546 2.075,29.614 C -0.099,28.993 0.127,23.897 4.201,23.365 l 0,0 3.055,-0.399 c 4.073,-0.531 6.972,2.367 6.441,6.442 l 0,0 -0.399,3.054 c -0.316,2.429 -2.255,3.49 -3.901,3.49 l 0,0 c -1.115,0 -2.096,-0.487 -2.346,-1.365"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath68" clipPathUnits="userSpaceOnUse"><path id="path70" d="m 11.246,26.21 c -4.159,-4.161 -4.159,-10.905 0,-15.064 l 0,0 c 4.161,-4.159 10.905,-4.159 15.064,0 l 0,0 c 4.159,4.159 4.159,10.903 0,15.064 l 0,0 c -2.08,2.079 -4.806,3.118 -7.532,3.118 l 0,0 c -2.726,0 -5.452,-1.039 -7.532,-3.118"/></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(13.2983,32.4624)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.531,4.075 -5.627,4.299 -6.248,2.125 l -0.934,-4.041 -4.041,-0.933 c -2.174,-0.621 -1.949,-5.717 2.126,-6.248 l 3.054,-0.399 c 4.074,-0.531 6.973,2.367 6.442,6.441 L 0,0 Z"/></g><g transform="translate(32.291,13.4707)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.074,-0.531 4.299,-5.629 2.125,-6.249 l -4.041,-0.933 -0.934,-4.042 c -0.62,-2.174 -5.716,-1.948 -6.248,2.126 l -0.398,3.055 c -0.531,4.074 2.367,6.973 6.441,6.441 L 0,0 Z"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(21.5537,15.9023)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.846,-2.846 -3.734,-6.572 -1.981,-8.324 1.75,-1.751 5.477,-0.864 8.323,1.982 2.847,2.846 3.733,6.574 1.982,8.324 C 6.572,3.734 2.846,2.846 0,0"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(9.6616,27.7944)" id="g48"><path id="path50" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.846,-2.846 -3.733,-6.573 -1.982,-8.324 1.752,-1.752 5.478,-0.864 8.324,1.982 2.847,2.846 3.734,6.572 1.982,8.324 C 6.573,3.733 2.846,2.846 0,0"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(26.3096,11.1465)" id="g60"><path id="path62" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.159,-4.16 -10.903,-4.16 -15.063,0 -4.159,4.159 -4.159,10.903 0,15.063 4.16,4.159 10.904,4.159 15.063,0 C 4.16,10.903 4.16,4.159 0,0"/></g></g></g><g id="g64"><g clip-path="url(#clipPath68)" id="g66"><g transform="translate(18.7085,18.9585)" id="g72"><path id="path74" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.184,-2.535 -11.269,-3.17 -12.486,1.679 -1.162,-2.766 -1.21,-5.46 0.246,-7.156 C -10.783,-7.174 -4.02,-6.988 0,0"/></g><g transform="translate(18.75,19)" id="g76"><path id="path78" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.643,-4.85 -2.532,-12.044 -7.461,-11.212 2.066,-2.175 4.514,-3.3 6.652,-2.646 C 1.331,-13.205 4.787,-6.486 0,0"/></g><g transform="translate(18.75,19)" id="g80"><path id="path82" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.65,-0.867 8.234,-5.483 6.392,-10.132 2.557,1.568 5.114,2.564 4.922,4.791 C 11.121,-3.114 7.344,3.328 0,0"/></g><g transform="translate(18.75,19)" id="g84"><path id="path86" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.541,3.333 8.285,6.246 12.168,3.096 11.439,6.006 11.434,8.516 9.25,9 7.067,9.484 -0.976,8.003 0,0"/></g><g transform="translate(18.7915,18.9585)" id="g88"><path id="path90" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.875,2.042 -5.792,8.042 -1.792,11.042 -3,0 -6,0 -7,-2 C -9.792,7.042 -8,1 0,0"/></g><g transform="translate(26.3096,11.1465)" id="g92"><path id="path94" style="fill:none;stroke:#dd2e44;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c -4.159,-4.16 -10.903,-4.16 -15.063,0 -4.159,4.159 -4.159,10.903 0,15.063 4.16,4.159 10.904,4.159 15.063,0 C 4.16,10.903 4.16,4.159 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M13.298 3.538c-.531-4.075-5.627-4.3-6.248-2.125l-.933 4.041-4.041.933c-2.175.621-1.949 5.717 2.125 6.248l3.054.399c4.074.531 6.973-2.367 6.441-6.441l-.398-3.055zm18.993 18.991c4.074.531 4.299 5.629 2.125 6.249l-4.041.933-.934 4.042c-.62 2.174-5.717 1.948-6.248-2.126l-.398-3.055c-.531-4.074 2.367-6.973 6.441-6.441l3.055.398z"/><path fill="#BE1931" d="M30.49 22.294l-1.254-.164c-4.074-.531-6.973 2.367-6.441 6.441l.087.667c1.622-.268 3.45-1.236 5.014-2.8 1.29-1.288 2.172-2.758 2.594-4.144zM6.906 12.988l.349.046c4.074.531 6.973-2.367 6.441-6.441l-.119-.91c-1.317.447-2.697 1.304-3.915 2.523-1.49 1.489-2.437 3.219-2.756 4.782z"/><circle fill="#DD2E44" cx="18.779" cy="17.323" r="10.651"/><g fill="#F5F8FA"><path d="M18.75 17c.39 2.943-.632 6.74-2.593 9.092.84.25 1.72.381 2.621.381.731 0 1.447-.095 2.14-.261.563-2.586.256-5.927-2.168-9.212zm0 0c3.407.635 6.232 3.286 6.779 6.484 1.326-1.45 2.143-3.251 2.347-5.19-1.861-1.889-4.902-3.208-9.126-1.294zm0 0c1.049-2.269 4.509-4.338 7.836-4.438-.375-.613-.816-1.19-1.337-1.711-.767-.767-1.641-1.358-2.571-1.795-2.373 1.241-4.452 3.647-3.928 7.944z"/><path d="M18.792 17.042c-2.81-1.481-4.577-5.04-3.817-8.031-.966.44-1.874 1.047-2.667 1.84-.563.563-1.027 1.187-1.412 1.844 1.287 1.959 3.754 3.829 7.896 4.347zm-.084 0c-2.57 1.557-6.231 2.391-8.958 1.683.235 1.541.862 3.03 1.886 4.309 2.374-.71 5.065-2.503 7.072-5.992z"/></g></svg>
\ No newline at end of file