diff options
| author | shpuld <shp@cock.li> | 2019-01-26 17:50:41 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-26 17:50:41 +0200 |
| commit | 0ab828bb30e70e190c1b26eda658ea1d14cc129f (patch) | |
| tree | 5b6816dbc839a0cf821a6b4945fb0a81c109b0f2 /static/config.json | |
| parent | 3978aaef84cc023908155343af76983f2715cf90 (diff) | |
| parent | 8197c77f75929aad557c98a5f698159b1a6d0c90 (diff) | |
Merge develop and fix conflict
Diffstat (limited to 'static/config.json')
| -rw-r--r-- | static/config.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/static/config.json b/static/config.json index cc72900a..24e26696 100644 --- a/static/config.json +++ b/static/config.json @@ -18,5 +18,6 @@ "hideUserStats": false, "loginMethod": "password", "webPushNotifications": false, - "noAttachmentLinks": false + "noAttachmentLinks": false, + "nsfwCensorImage": "" } |