diff options
| author | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
| commit | 4b3ec5351466f8615b32e62cc4e6215f8a80b105 (patch) | |
| tree | e46842eac5d8255858a113f71bdf42bfd75e4436 /config/test.exs | |
| parent | 4fd9df100f61dfe4731934eca86500472d866f60 (diff) | |
| parent | 6138b297836f459e4fe5d21dfed30ddd9397b6d4 (diff) | |
| download | pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.tar.gz pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.zip | |
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 0c73f892a..1bd11dee4 100644 --- a/config/test.exs +++ b/config/test.exs @@ -21,7 +21,7 @@ config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox # Reduce hash rounds for testing -config :comeonin, :pbkdf2_rounds, 1 +config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock |