diff options
| author | Hakaba Hitoyo <example@example.com> | 2018-02-10 10:17:58 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <example@example.com> | 2018-02-10 10:17:58 +0900 |
| commit | ebd8300e36be1af75a093264e77a9ba317a605cd (patch) | |
| tree | 670c8eb61d36459eb6573f64091178d5c0a737ba /static/config.json | |
| parent | f23940a153b501f5edaecd292ebf2c7b9345d33f (diff) | |
| parent | b0f248c48384c888faef8fcf76ee8b3f8abfde8e (diff) | |
slove conflict
Diffstat (limited to 'static/config.json')
| -rw-r--r-- | static/config.json | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/static/config.json b/static/config.json index 38b1062d..6c9c27da 100644 --- a/static/config.json +++ b/static/config.json @@ -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 |