diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-24 18:37:58 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-24 18:37:58 +0400 |
| commit | c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e (patch) | |
| tree | 6b6fffe4faeebbf7e103d16a427f6f68774b44d5 /test/fixtures | |
| parent | 364eecc49f137ae3c7798ad240983591e27b134c (diff) | |
| parent | 2430b9bf90d6fde71885f5f0f8be767526be6208 (diff) | |
| download | pleroma-c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e.tar.gz pleroma-c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e.zip | |
Merge branch 'develop' into global-status-expiration
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 |