diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 18:51:59 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 18:51:59 +0300 |
| commit | 0062116e07446beea13768d122e5bcb19c60dde7 (patch) | |
| tree | 2c050be2e440364824680fdff3c4499daf118dee /test/fixtures | |
| parent | 2958a7d246f40141a88bcb7bdd6a477c4f65f0bc (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-0062116e07446beea13768d122e5bcb19c60dde7.tar.gz pleroma-0062116e07446beea13768d122e5bcb19c60dde7.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
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 |