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/1f3cb.svg b/public/emoji/1f3cb.svg
index 01306a753..9940b781b 100644
--- a/public/emoji/1f3cb.svg
+++ b/public/emoji/1f3cb.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(14.7783,0.7461)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.141,-0.534 0.687,-0.854 1.222,-0.713 0.534,0.141 0.853,0.687 0.714,1.222 L 0.41,6.312 C 0.27,6.846 -0.276,7.165 -0.811,7.024 -1.345,6.885 -1.664,6.338 -1.523,5.804 L 0,0 Z"/></g><g transform="translate(19.2871,1.2539)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.141,-0.534 0.178,-1.08 0.713,-1.221 0.535,-0.14 1.081,0.178 1.222,0.713 L 3.459,5.295 C 3.6,5.83 3.28,6.377 2.746,6.517 2.211,6.657 1.665,6.338 1.524,5.804 L 0,0 Z"/></g><g transform="translate(14.2051,21.2959)" id="g28"><path id="path30" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.163,-0.528 -0.205,-2.296 -0.205,-2.296 -1,0 -1.543,1.177 -1.706,1.705 L -5.16,9.918 c -0.163,0.528 0.132,1.088 0.66,1.251 0.527,0.163 1.087,-0.132 1.251,-0.66 L 0,0 Z"/></g><g transform="translate(21.7949,21.2959)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.163,-0.528 0.205,-2.296 0.205,-2.296 1,0 1.543,1.177 1.705,1.705 L 5.16,9.918 C 5.323,10.446 5.027,11.006 4.5,11.169 3.973,11.332 3.412,11.037 3.25,10.509 L 0,0 Z"/></g><g transform="translate(18.3823,33)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.907,0 -1.745,-0.29 -2.432,-0.778 -1.412,-0.074 -2.539,-1.233 -2.539,-2.663 0,-1.179 0.006,-2.664 1.559,-3.218 0.763,-1.06 2.005,-1.753 3.412,-1.753 2.323,0 4.206,1.883 4.206,4.206 C 4.206,-1.883 2.323,0 0,0"/></g><g transform="translate(19,13)" id="g40"><path id="path42" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -3,-2 -1,-5 3,0 1,3 2,0 1,-3 3,0 -1,5 -3,2 z"/></g><g transform="translate(13,0)" id="g44"><path id="path46" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(19,0)" id="g48"><path id="path50" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(22,22)" id="g52"><path id="path54" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -4,0 -2,0 0,-3 0,-7 8,0 0,7 0,3 z"/></g><g transform="translate(16.4707,24.5884)" id="g56"><path id="path58" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.059 c 0,-0.845 0.685,-1.529 1.529,-1.529 0.845,0 1.53,0.684 1.53,1.529 L 3.059,0 0,0 Z"/></g><g transform="translate(21.8232,30.7061)" id="g60"><path id="path62" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.647,0 0,-4.588 0,-0.001 c 0,-2.112 1.712,-3.823 3.824,-3.823 2.112,0 3.823,1.711 3.823,3.823 L 0,-4.588 0,0 Z"/></g><g transform="translate(16.3999,30.7769)" id="g64"><path id="path66" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.4,0 0,-3.201 c 1.866,0 2.279,1.93 2.372,2.791 C 0.003,-1.271 0.624,-3.201 5.6,-3.201 L 5.6,0 0,0 Z"/></g><g transform="translate(19.5293,23.8237)" id="g68"><path id="path70" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.529,0 -1.53,0 c 0,0 0,-0.765 1.53,-0.765 C 0,-0.765 0,0 0,0"/></g><g transform="translate(16.4707,26.5)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.211 -0.171,-0.382 -0.382,-0.382 -0.212,0 -0.383,0.171 -0.383,0.382 0,0.211 0.171,0.382 0.383,0.382 C -0.171,0.382 0,0.211 0,0"/></g><g transform="translate(20.2939,26.5)" id="g76"><path id="path78" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.211 -0.171,-0.382 -0.382,-0.382 -0.212,0 -0.383,0.171 -0.383,0.382 0,0.211 0.171,0.382 0.383,0.382 C -0.171,0.382 0,0.211 0,0"/></g><g transform="translate(17.2354,25.353)" id="g80"><path id="path82" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.765,0 0.764,0 c 0,0 0,-0.765 -0.764,-0.765 C 0,-0.765 0,0 0,0"/></g><path id="path84" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,11 -8,0 0,2 8,0 0,-2 z"/><g transform="translate(33.5,32.5)" id="g86"><path id="path88" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 l -30,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 30,0 C -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(32,36)" id="g90"><path id="path92" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,-0.448 -1,-1 0,0.552 -0.447,1 -1,1 -0.553,0 -1,-0.448 -1,-1 l 0,-5 c 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 l 0,5 C 1,-0.448 0.553,0 0,0"/></g><g transform="translate(6,36)" id="g94"><path id="path96" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,-0.448 -1,-1 0,0.552 -0.447,1 -1,1 -0.553,0 -1,-0.448 -1,-1 l 0,-5 c 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 l 0,5 C 1,-0.448 0.553,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M14.778 35.254c.141.534.688.854 1.222.713.534-.141.854-.687.714-1.222l-1.525-5.803c-.14-.534-.687-.854-1.221-.713-.534.14-.854.687-.713 1.221l1.523 5.804zm4.509-.508c-.141.534.178 1.08.713 1.221.535.141 1.081-.178 1.222-.713l1.524-5.803c.141-.535-.179-1.082-.713-1.222-.535-.141-1.081.179-1.222.713l-1.524 5.804zm-5.082-20.042C14.368 15.232 14 17 14 17c-1 0-1.542-1.177-1.706-1.705L9.045 4.786c-.163-.528.132-1.088.66-1.251.527-.163 1.087.132 1.25.66l3.25 10.509zm7.59 0C21.632 15.232 22 17 22 17c1 0 1.543-1.177 1.705-1.705l3.25-10.509c.163-.528-.133-1.088-.66-1.251-.527-.163-1.088.132-1.25.66l-3.25 10.509z"/><path fill="#FFAC33" d="M18.382 3c-.907 0-1.745.29-2.432.778-1.412.074-2.539 1.232-2.539 2.663 0 1.179.005 2.664 1.559 3.217.763 1.061 2.005 1.753 3.412 1.753 2.323 0 4.206-1.882 4.206-4.205C22.588 4.883 20.705 3 18.382 3z"/><path fill="#4289C1" d="M19 23h-2l-3 2-1 5h3l1-3h2l1 3h3l-1-5zm-6 13v-1s0-1 2-1 2 1 2 1v1h-4zm6 0v-1s0-1 2-1 2 1 2 1v1h-4z"/><path fill="#4289C1" d="M22 14h-8v10h8V14z"/><path fill="#FFDC5D" d="M16.471 11.412v3.059c0 .844.684 1.529 1.529 1.529s1.529-.685 1.529-1.529v-3.059h-3.058z"/><path fill="#FFDC5D" d="M21.823 5.294h-7.647v4.588c0 2.112 1.712 3.823 3.824 3.823s3.823-1.711 3.823-3.823V5.294z"/><path fill="#FFAC33" d="M16.4 5.223H14v3.201c1.867 0 2.28-1.93 2.373-2.791.031.86.651 2.791 5.628 2.791V5.223H16.4z"/><path fill="#C1694F" d="M19.529 12.176h-3.058s0 .765 1.529.765 1.529-.765 1.529-.765z"/><circle fill="#662113" cx="16.088" cy="9.5" r=".382"/><path fill="#662113" d="M20.294 9.5c0 .211-.171.382-.382.382-.212 0-.383-.171-.383-.382s.171-.382.383-.382c.211 0 .382.171.382.382z"/><path fill="#C1694F" d="M17.235 10.647h1.53s0 .765-.765.765-.765-.765-.765-.765z"/><path fill="#662113" d="M14 23h8v2h-8z"/><path fill="#99AAB5" d="M33.5 3.5c0 .276-.224.5-.5.5H3c-.276 0-.5-.224-.5-.5S2.724 3 3 3h30c.276 0 .5.224.5.5z"/><path fill="#292F33" d="M32 0c-.553 0-1 .448-1 1 0-.552-.447-1-1-1s-1 .448-1 1v5c0 .552.447 1 1 1s1-.448 1-1c0 .552.447 1 1 1s1-.448 1-1V1c0-.552-.447-1-1-1zM6 0c-.553 0-1 .448-1 1 0-.552-.447-1-1-1S3 .448 3 1v5c0 .552.447 1 1 1s1-.448 1-1c0 .552.447 1 1 1s1-.448 1-1V1c0-.552-.447-1-1-1z"/></svg>
\ No newline at end of file