diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
| commit | e7fb593d130e0ad62e3690dce4a0913fe3d40ef0 (patch) | |
| tree | 8edbc679acda1e5e024884c12cbceb2509417033 /test/fixtures/config | |
| parent | b03aeae8b935b0a211c51cc3be5f1c15591f5a2f (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.tar.gz pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/fixtures/config')
| -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 |