diff options
| author | lain <lain@soykaf.club> | 2020-04-23 15:47:08 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-23 15:47:08 +0200 |
| commit | ec7335535d857c6777798ed08dab357b07fb6efa (patch) | |
| tree | 09b32798fbaa271c6ea33912899cc067e0cdd495 /test/fixtures | |
| parent | 1d6338f2d38284e94e17be58c21c7f34b5621ab7 (diff) | |
| parent | 1b5f8d19eeccfe202c0377079caa6a1d6f3cacb5 (diff) | |
| download | pleroma-ec7335535d857c6777798ed08dab357b07fb6efa.tar.gz pleroma-ec7335535d857c6777798ed08dab357b07fb6efa.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 |