From 5b52e020e32def19622e3d1df82f93bc716946e2 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 8 Feb 2019 13:20:47 -0800 Subject: [PATCH] fixing conflicts --- src/modules/instance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/instance.js b/src/modules/instance.js index 46ca04d8..b4ec8253 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -29,7 +29,7 @@ const defaultState = { nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, - showFeaturesPanel: false, + showFeaturesPanel: true, // Nasty stuff pleromaBackend: true,