fixing conflicts
This commit is contained in:
parent
ced29a6482
commit
5b52e020e3
1 changed files with 1 additions and 1 deletions
|
@ -29,7 +29,7 @@ const defaultState = {
|
||||||
nsfwCensorImage: undefined,
|
nsfwCensorImage: undefined,
|
||||||
vapidPublicKey: undefined,
|
vapidPublicKey: undefined,
|
||||||
noAttachmentLinks: false,
|
noAttachmentLinks: false,
|
||||||
showFeaturesPanel: false,
|
showFeaturesPanel: true,
|
||||||
|
|
||||||
// Nasty stuff
|
// Nasty stuff
|
||||||
pleromaBackend: true,
|
pleromaBackend: true,
|
||||||
|
|
Loading…
Reference in a new issue