diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-21 16:24:57 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-21 16:24:57 +0000 |
| commit | b92a16aa006dd7ec26397b6fcd111c8f8f843a9c (patch) | |
| tree | 843acb85e9df0bfd03c4596cef7d33993cd4d96e /config | |
| parent | b68fb3dc172a2cb13c07d7e42351947ecade1e3b (diff) | |
| parent | e59cfa7cacd48d699e42b63eb9ec9503d72083a2 (diff) | |
| download | pleroma-b92a16aa006dd7ec26397b6fcd111c8f8f843a9c.tar.gz pleroma-b92a16aa006dd7ec26397b6fcd111c8f8f843a9c.zip | |
Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index ccdd35777..c20802faf 100644 --- a/config/config.exs +++ b/config/config.exs @@ -8,8 +8,6 @@ use Mix.Config # General application configuration config :pleroma, ecto_repos: [Pleroma.Repo] -config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes - config :pleroma, Pleroma.Captcha, enabled: false, seconds_valid: 60, @@ -273,8 +271,6 @@ config :pleroma, :media_proxy, config :pleroma, :chat, enabled: true -config :ecto, json_library: Jason - config :phoenix, :format_encoders, json: Jason config :pleroma, :gopher, |