diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-12 22:15:43 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-12 22:15:43 +0300 |
| commit | 936951826e689eecbe26ae4828aa5f9152d3e1b4 (patch) | |
| tree | 9822f65f99e76a4af6d4faea525330b2cf2f82f5 /config | |
| parent | 007e0c1ce158bdfc11738a194944534837ae0258 (diff) | |
| parent | 50269e9cacdbb7834c31fc7ad9872b68977e9f10 (diff) | |
| download | pleroma-936951826e689eecbe26ae4828aa5f9152d3e1b4.tar.gz pleroma-936951826e689eecbe26ae4828aa5f9152d3e1b4.zip | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 5206fe375..0e91df886 100644 --- a/config/config.exs +++ b/config/config.exs @@ -373,6 +373,8 @@ config :pleroma, :chat, enabled: true config :phoenix, :format_encoders, json: Jason +config :phoenix, :json_library, Jason + config :pleroma, :gopher, enabled: false, ip: {0, 0, 0, 0}, |