Merge develop and fix conflict
This commit is contained in:
commit
0ab828bb30
25 changed files with 2489 additions and 312 deletions
|
@ -18,5 +18,6 @@
|
|||
"hideUserStats": false,
|
||||
"loginMethod": "password",
|
||||
"webPushNotifications": false,
|
||||
"noAttachmentLinks": false
|
||||
"noAttachmentLinks": false,
|
||||
"nsfwCensorImage": ""
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue