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/2623.svg b/public/emoji/2623.svg
index 2240cd6d9..6e7d8584e 100644
--- a/public/emoji/2623.svg
+++ b/public/emoji/2623.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(35,18)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.389 -7.611,-17 -17,-17 -9.389,0 -17,7.611 -17,17 0,9.389 7.611,17 17,17 C -7.611,17 0,9.389 0,0"/></g><g transform="translate(12.8659,17.9048)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.398,0.153 -0.81,0.246 -1.246,0.246 -0.087,0 -0.179,-0.013 -0.269,-0.019 -0.084,-0.006 -0.173,-0.03 -0.259,-0.04 0.037,-2.613 1.536,-4.874 3.716,-6.006 0.05,0.079 0.105,0.154 0.149,0.237 0.114,0.21 0.21,0.432 0.286,0.666 0.025,0.076 0.059,0.146 0.079,0.224 0.049,0.185 0.076,0.369 0.098,0.552 C 1.097,-3.299 0.099,-1.776 0,0"/></g><g transform="translate(14.2428,23.9608)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.206,-0.566 0.532,-1.065 0.955,-1.471 0.799,0.515 1.745,0.823 2.765,0.823 0.996,0 1.918,-0.298 2.706,-0.792 0.116,0.115 0.238,0.22 0.346,0.352 0.28,0.346 0.489,0.714 0.632,1.109 C 6.337,0.702 5.075,1.102 3.72,1.102 2.349,1.102 1.073,0.694 0,0"/></g><g transform="translate(20.4505,13.735)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.065,-0.586 0.25,-1.132 0.582,-1.645 0.59,-1.657 0.6,-1.665 0.608,-1.677 2.822,-0.554 4.35,1.728 4.382,4.369 4.219,4.389 4.055,4.405 3.892,4.405 3.448,4.405 3.017,4.32 2.609,4.176 2.511,2.376 1.487,0.835 0,0"/></g><g transform="translate(24.415,8.9663)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.882,0 -5.217,2.336 -5.217,5.217 0,0.863 0.21,1.675 0.58,2.392 -0.207,0.12 -0.406,0.236 -0.609,0.354 -0.278,-0.336 -0.692,-0.554 -1.161,-0.554 -0.474,0 -0.892,0.223 -1.169,0.564 C -7.791,7.848 -8,7.727 -8.212,7.604 -7.844,6.888 -7.634,6.078 -7.634,5.217 -7.634,2.336 -9.97,0 -12.852,0 c -1.574,0 -2.984,0.698 -3.941,1.801 -0.065,-0.04 -0.178,-0.111 -0.192,-0.12 1.078,-1.361 2.442,-2.27 4.122,-2.664 0.457,-0.107 0.902,-0.162 1.341,-0.19 0.136,-0.008 0.273,-0.023 0.406,-0.024 0.04,0 0.078,0.005 0.118,0.005 0.346,0.003 0.686,0.036 1.021,0.088 0.06,0.009 0.121,0.019 0.181,0.03 1.164,0.213 2.264,0.71 3.3,1.49 0.006,0.004 0.037,0.021 0.068,0.027 0.006,0.001 0.006,0.004 0.012,0.004 0.039,0 0.071,-0.026 0.078,-0.031 0.114,-0.088 0.232,-0.164 0.349,-0.246 0.135,-0.094 0.272,-0.186 0.41,-0.27 0.147,-0.091 0.295,-0.179 0.445,-0.258 0.255,-0.135 0.515,-0.251 0.779,-0.354 0.121,-0.047 0.244,-0.087 0.367,-0.127 0.299,-0.098 0.601,-0.183 0.911,-0.24 0.064,-0.012 0.13,-0.016 0.194,-0.026 0.316,-0.049 0.639,-0.076 0.968,-0.082 0.062,-10e-4 0.124,-0.006 0.187,-0.006 0.277,0.002 0.558,0.015 0.843,0.048 2.06,0.235 3.728,1.201 5.027,2.818 L 3.954,1.816 C 2.997,0.705 1.581,0 0,0"/></g><g transform="translate(11.5634,19.4012)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.824,0 3.429,-0.937 4.362,-2.355 0.009,-0.012 0.018,-0.024 0.027,-0.035 0.003,-0.003 0.005,-0.006 0.008,-0.009 0.178,0.103 0.364,0.215 0.554,0.318 0.049,0.027 0.063,0.058 0.064,0.096 -0.049,0.15 -0.083,0.306 -0.083,0.472 0,0.742 0.536,1.357 1.241,1.485 l 0,0.712 c -2.762,0.134 -4.96,2.415 -4.96,5.211 0,2.542 1.818,4.658 4.225,5.122 l 0,0.246 C 4.322,11.191 1.951,10.048 0.885,8.821 -0.603,7.108 -1.189,5.111 -0.894,2.86 -0.879,2.749 -0.897,2.696 -1.012,2.65 c -3.567,-1.43 -5.437,-5.283 -4.36,-8.978 0.068,-0.235 0.157,-0.464 0.239,-0.701 l 0.206,0.094 c -0.187,0.538 -0.29,1.116 -0.29,1.718 C -5.217,-2.336 -2.882,0 0,0"/></g><g transform="translate(30.0048,16.3393)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.491,2.726 -2.026,4.631 -4.576,5.714 -0.1,0.043 -0.127,0.089 -0.111,0.193 0.123,0.795 0.107,1.59 -0.033,2.382 -0.238,1.343 -0.852,2.549 -1.712,3.538 -0.004,0.003 -0.007,0.007 -0.01,0.011 -0.193,0.221 -0.399,0.428 -0.617,0.625 -0.031,0.028 -0.063,0.056 -0.095,0.084 -0.205,0.179 -0.418,0.347 -0.642,0.503 -0.053,0.037 -0.108,0.071 -0.163,0.107 -0.216,0.142 -0.436,0.277 -0.668,0.397 -0.072,0.037 -1.278,0.621 -2.393,0.769 l 0,-0.004 0,-0.24 c 2.407,-0.464 4.226,-2.58 4.226,-5.122 0,-2.796 -2.199,-5.078 -4.962,-5.212 l 0,-0.707 c 0.72,-0.116 1.272,-0.736 1.272,-1.489 0,-0.183 -0.037,-0.356 -0.097,-0.518 0.008,-0.011 0.004,-0.023 0.023,-0.033 0.194,-0.106 0.385,-0.22 0.58,-0.333 0.928,1.441 2.546,2.397 4.388,2.397 2.882,0 5.218,-2.336 5.218,-5.218 0,-0.595 -0.102,-1.167 -0.286,-1.701 0.066,-0.035 0.196,-0.105 0.204,-0.106 0.018,0.044 0.038,0.089 0.056,0.136 C 0.074,-2.587 0.235,-1.307 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#F4900C" cx="18" cy="18" r="17"/><path fill="#FFF" d="M12.866 18.095c-.398-.153-.81-.246-1.246-.246-.087 0-.179.012-.269.019-.084.006-.173.031-.259.041.036 2.613 1.536 4.874 3.715 6.006.05-.079.105-.154.15-.237.113-.21.209-.432.286-.666.025-.076.058-.146.079-.223.049-.186.075-.369.098-.552-1.457-.842-2.455-2.366-2.554-4.142zm1.377-6.056c.206.566.532 1.065.955 1.471.799-.515 1.745-.823 2.764-.823.996 0 1.919.298 2.706.791.117-.115.238-.219.346-.352.28-.346.49-.714.632-1.109-1.066-.68-2.328-1.08-3.684-1.08-1.37.001-2.646.408-3.719 1.102zm6.207 10.226c.065.586.25 1.132.582 1.645.008.012.018.02.026.032 2.214-1.123 3.742-3.405 3.774-6.046-.163-.02-.327-.036-.49-.036-.443 0-.874.085-1.283.228-.098 1.801-1.121 3.342-2.609 4.177z"/><path d="M24.415 27.034c-2.882 0-5.217-2.336-5.217-5.217 0-.862.21-1.675.581-2.391l-.61-.354c-.277.335-.691.553-1.16.553-.474 0-.892-.223-1.169-.564l-.636.37c.369.715.578 1.526.578 2.386 0 2.882-2.336 5.217-5.217 5.217-1.574 0-2.985-.698-3.941-1.801l-.192.12c1.079 1.361 2.442 2.27 4.122 2.664.457.107.902.162 1.342.189.135.008.272.023.406.024.04 0 .078-.005.117-.005.346-.003.686-.035 1.021-.088.061-.009.121-.019.181-.03 1.163-.213 2.264-.71 3.3-1.49.006-.005.037-.021.068-.027.005-.001.006-.005.012-.005.039 0 .071.026.078.031.114.088.232.165.349.246.136.094.272.186.411.271.147.09.295.179.445.258.255.134.514.251.778.354.121.047.244.087.367.127.299.098.601.183.911.24.064.012.129.016.193.026.317.049.64.076.968.082.063.001.124.006.188.006.277-.002.558-.015.843-.047 2.06-.236 3.728-1.202 5.027-2.819l-.188-.142c-.959 1.111-2.375 1.816-3.956 1.816zM11.563 16.599c1.824 0 3.429.937 4.362 2.355l.027.035.008.009c.179-.103.364-.215.554-.318.05-.027.063-.058.064-.096-.049-.149-.083-.306-.083-.472 0-.742.535-1.357 1.24-1.485v-.711c-2.762-.134-4.96-2.416-4.96-5.211 0-2.542 1.819-4.659 4.226-5.122v-.247c-1.116.072-3.487 1.215-4.553 2.442-1.488 1.713-2.074 3.71-1.779 5.961.015.111-.003.164-.118.21-3.567 1.43-5.438 5.283-4.36 8.978.068.235.157.464.239.701l.206-.095c-.187-.538-.291-1.115-.291-1.717.001-2.881 2.337-5.217 5.218-5.217zm18.442 3.062c-.491-2.726-2.026-4.631-4.576-5.714-.1-.043-.127-.088-.111-.192.123-.796.107-1.59-.033-2.382-.238-1.343-.852-2.549-1.712-3.538l-.009-.011c-.193-.221-.399-.428-.617-.625l-.095-.084c-.205-.179-.418-.347-.643-.503-.053-.037-.108-.071-.162-.107-.217-.142-.437-.277-.669-.397-.073-.038-1.278-.622-2.393-.77v.244c2.407.463 4.226 2.58 4.226 5.122 0 2.796-2.199 5.078-4.962 5.211v.708c.72.116 1.272.735 1.272 1.488 0 .183-.037.356-.097.518.008.011.004.022.023.033.194.107.385.22.58.334.928-1.442 2.546-2.397 4.388-2.397 2.882 0 5.217 2.336 5.217 5.217 0 .596-.101 1.168-.285 1.701.065.035.195.105.204.106.018-.044.038-.089.055-.135.473-1.24.634-2.52.399-3.827z" fill="#FFF"/></svg>
\ No newline at end of file