Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
This commit is contained in:
commit
63d00f8123
71 changed files with 7051 additions and 258 deletions
|
|
@ -47,6 +47,7 @@ config :pleroma, Pleroma.Repo,
|
|||
password: "postgres",
|
||||
database: "pleroma_test",
|
||||
hostname: System.get_env("DB_HOST") || "localhost",
|
||||
port: System.get_env("DB_PORT") || "5432",
|
||||
pool: Ecto.Adapters.SQL.Sandbox,
|
||||
pool_size: 50
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue