diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-22 20:18:12 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-22 20:18:12 +0400 |
| commit | 6c26feed01b2e836e7ebdefe9683ddb03cb57757 (patch) | |
| tree | 4b143a6708d405e5fc6ebf69910c9ae18066502b /test/fixtures | |
| parent | 11433cd38d9761ddf3fdb94f8c39526910b975c1 (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-6c26feed01b2e836e7ebdefe9683ddb03cb57757.tar.gz pleroma-6c26feed01b2e836e7ebdefe9683ddb03cb57757.zip | |
Merge branch 'develop' into openapi/account
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/config/temp.secret.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/fixtures/config/temp.secret.exs b/test/fixtures/config/temp.secret.exs index f4686c101..dc950ca30 100644 --- a/test/fixtures/config/temp.secret.exs +++ b/test/fixtures/config/temp.secret.exs @@ -7,3 +7,5 @@ config :pleroma, :second_setting, key: "value2", key2: ["Activity"] config :quack, level: :info config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox + +config :postgrex, :json_library, Poison |