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/1f918-1f3ff.svg b/public/emoji/1f918-1f3ff.svg
index 8727eccb9..94bf9a18f 100644
--- a/public/emoji/1f918-1f3ff.svg
+++ b/public/emoji/1f918-1f3ff.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(25,18.875)" id="g20"><path id="path22" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8,-0.021 c -1.104,0 -1.875,-0.75 -1.875,-1.854 0,-1.104 0.771,-1.854 1.875,-1.854 l 5.266,-0.021 c 0,0 0.88,0.104 0.88,-0.625 C -1.854,-4.651 -2.224,-5 -2.5,-5 -2.5,-5 -7,-4.792 -7.375,-11.875 -7.39,-12.151 -7.724,-12.5 -8,-12.5 c -0.276,0 -0.625,0.349 -0.625,0.625 0,3.01 1.396,5.938 2.867,6.824 -0.91,0 -1.711,0.051 -2.242,0.051 -1,0 -1.438,0.334 -1.438,0.333 -0.146,-0.231 -0.562,-1.27 -2.687,-1.27 -2.375,0 -3.021,2.362 -3.021,3.02 l 0,5.021 0.146,0.021 c 0,0.811 0.485,1.507 1.18,1.82 l -0.097,-6.653 c 0,-1.105 0.813,-2.084 1.917,-2.084 0.755,0 1.263,0.341 1.604,0.959 -0.458,0.526 -0.677,1.132 -0.677,1.885 0,0.886 0.318,1.795 0.927,2.344 l 0.042,2.708 0.104,0.021 c 0,0.811 0.485,1.507 1.18,1.82 L -8.875,2.125 -8.896,1.104 c 0.315,0.111 0.564,0.146 0.917,0.146 l 2.875,-0.021 0,2.917 0.104,-0.021 0,9 c 0,0.811 0.485,1.507 1.18,1.82 l -0.034,-13.66 3.646,0 L 0,1.125 c 0.922,0 1.723,-2 1.723,-2 0,0 0.002,-0.013 0.002,-0.015 C 1.481,-0.471 0.968,0 0,0"/></g><g transform="translate(15,19.2217)" id="g24"><path id="path26" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.609,-0.549 -1,-1.336 -1,-2.222 0,-0.753 0.287,-1.432 0.745,-1.959 -0.341,-0.617 -0.99,-1.041 -1.745,-1.041 -1.104,0 -2,0.896 -2,2 l 0,6 c 0,0.293 0.067,0.57 0.18,0.82 0.313,0.695 1.009,1.18 1.82,1.18 1.104,0 2,-0.895 2,-2 l 0,-1 L 0,0 Z"/></g><g transform="translate(6,30)" id="g28"><path id="path30" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.104 0.896,2 2,2 3.104,2 4,1.104 4,0 l 0,-9 0,-2 0,-3 c 0,-0.658 0.217,-1.262 0.578,-1.753 0.028,-0.037 0.061,-0.068 0.089,-0.102 0.104,-0.129 0.21,-0.255 0.332,-0.366 0.033,-0.027 0.066,-0.054 0.1,-0.082 0.119,-0.098 0.243,-0.188 0.377,-0.268 0.066,-0.039 0.131,-0.075 0.201,-0.109 0.139,-0.069 0.285,-0.125 0.435,-0.172 0.068,-0.02 0.131,-0.045 0.2,-0.061 C 6.534,-16.966 6.763,-17 7,-17 c 0.236,0 0.461,0.036 0.681,0.089 0.076,0.017 0.148,0.042 0.222,0.066 0.137,0.044 0.269,0.099 0.396,0.161 0.082,0.04 0.163,0.077 0.24,0.124 0.164,0.1 0.318,0.213 0.46,0.341 0.202,0.184 0.384,0.387 0.53,0.618 -10e-4,0.001 -0.002,0.002 -0.003,0.003 C 9.727,-15.713 10,-16 11,-16 l 2.537,0 c -1.808,-1.365 -3.037,-3.99 -3.037,-7 0,-0.276 0.224,-0.5 0.5,-0.5 0.276,0 0.5,0.224 0.5,0.5 0,3.859 2.187,7 4.875,7 l 0.125,0 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 l -1.5,0 -4,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 8,0 c 0.968,0 1.481,-0.596 1.725,-1.015 0.126,-0.216 0.185,-0.389 0.188,-0.4 L 22,-16 c 0.103,-0.335 0.479,-1.871 0.411,-2.191 C 22.411,-23 17.715,-28 12,-28 5.463,-28 0,-22.75 0,-16 0.008,-16.007 0,0 0,0"/></g><g transform="translate(20,20)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3,0 C -3.352,0 -3.685,-0.072 -4,-0.184 L -4,1 -4,3 c 0,0.293 0.067,0.569 0.18,0.82 C -3.507,4.515 -2.811,5 -2,5 -0.896,5 0,4.104 0,3 L 0,1 0,0 Z"/></g><g transform="translate(21,20)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,13 c 0,0.293 0.067,0.569 0.18,0.82 C 0.493,14.515 1.189,15 2,15 3.104,15 4,14.104 4,13 L 4,1 4,0 3,0 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#583529" d="M25 17.125l-8 .021c-1.104 0-1.875.75-1.875 1.854s.771 1.854 1.875 1.854l5.266.021s.879-.104.879.625c0 .276-.369.625-.646.625 0 0-4.5-.208-4.875 6.875-.015.276-.349.625-.625.625s-.624-.349-.624-.625c0-3.01 1.396-5.938 2.867-6.823-.911 0-1.711-.052-2.242-.052-1 0-1.438-.334-1.438-.333-.146.231-.562 1.271-2.688 1.271-2.375 0-3.021-2.363-3.021-3.021v-5.021L10 15c0-.811.485-1.507 1.18-1.82l-.096 6.654c0 1.104.812 2.083 1.917 2.083.755 0 1.263-.341 1.604-.958-.458-.526-.677-1.133-.677-1.885 0-.886.318-1.795.927-2.344l.042-2.708L15 14c0-.811.485-1.507 1.18-1.82L16.125 15l-.021 1.021c.315-.111.564-.146.917-.146l2.875.021v-2.917L20 13V4c0-.811.485-1.507 1.18-1.82l-.034 13.66h3.646L25 16c.922 0 1.723 2 1.723 2l.002.015c-.244-.419-.757-.89-1.725-.89z"/><path fill="#7C533E" d="M15 16.778c-.609.549-1 1.336-1 2.222 0 .753.287 1.433.745 1.959C14.404 21.576 13.755 22 13 22c-1.104 0-2-.896-2-2v-6c0-.293.067-.569.18-.82.313-.695 1.009-1.18 1.82-1.18 1.104 0 2 .896 2 2v2.778z"/><path fill="#7C533E" d="M6 6c0-1.104.896-2 2-2s2 .896 2 2v14c0 .658.217 1.262.578 1.753.027.037.061.068.089.103.104.129.21.255.332.365.033.027.065.055.1.082.119.099.243.189.377.269.066.039.132.074.201.108.14.069.285.125.435.172.067.021.131.046.2.062.222.052.451.086.688.086.236 0 .461-.036.681-.089.076-.018.148-.042.223-.066.137-.044.269-.099.396-.161.082-.04.163-.076.24-.124.164-.1.318-.213.46-.341.202-.184.384-.387.53-.618l-.003-.003c.2.115.473.402 1.473.402h2.537c-1.809 1.365-3.037 3.99-3.037 7 0 .276.224.5.5.5s.5-.224.5-.5c0-3.859 2.187-7 4.875-7h.125c.276 0 .5-.224.5-.5s-.224-.5-.5-.5H17c-1.104 0-2-.896-2-2s.896-2 2-2h8c.968 0 1.481.596 1.725 1.015.126.217.185.389.188.4L28 22c.103.335.479 1.871.411 2.191C28.411 29 23.715 34 18 34c-6.537 0-12-5.25-12-12 .008.007 0-16 0-16z"/><path fill="#7C533E" d="M20 16h-3c-.352 0-.685.072-1 .184V13c0-.293.067-.569.18-.82.313-.695 1.009-1.18 1.82-1.18 1.104 0 2 .896 2 2v3zm1 0V3c0-.293.067-.569.18-.82C21.493 1.485 22.189 1 23 1c1.104 0 2 .896 2 2v13h-4z"/></svg>
\ No newline at end of file