fixing conflicts
This commit is contained in:
parent
ced29a6482
commit
5b52e020e3
|
@ -29,7 +29,7 @@ const defaultState = {
|
|||
nsfwCensorImage: undefined,
|
||||
vapidPublicKey: undefined,
|
||||
noAttachmentLinks: false,
|
||||
showFeaturesPanel: false,
|
||||
showFeaturesPanel: true,
|
||||
|
||||
// Nasty stuff
|
||||
pleromaBackend: true,
|
||||
|
|
Loading…
Reference in New Issue