fixing conflicts

6 years ago · 5b52e020e3
parent ced29a6482
commit 5b52e020e3
1 changed files with 1 additions and 1 deletions
--- 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,