slove conflict
This commit is contained in:
commit
ebd8300e36
8 changed files with 108 additions and 37 deletions
|
@ -1,9 +1,7 @@
|
|||
{
|
||||
"name": "Pleroma FE",
|
||||
"theme": "pleroma-dark",
|
||||
"background": "/static/bg.jpg",
|
||||
"logo": "/static/logo.png",
|
||||
"registrationOpen": true,
|
||||
"defaultPath": "/main/all",
|
||||
"chatDisabled": false,
|
||||
"showInstanceSpecificPanel": false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue