diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-04 20:50:28 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-04 20:50:28 +0700 |
| commit | 3a3a3996b7a37d281745586fa40bbabd5299a1ce (patch) | |
| tree | 843d5295c820fef6d5112677dd1145b3757ad2ac /config/test.exs | |
| parent | 58e250d9d27205116df5634d909ec1e43ea55286 (diff) | |
| parent | 89762ad23034668f7440c9fb238dcf270e8c2e59 (diff) | |
| download | pleroma-3a3a3996b7a37d281745586fa40bbabd5299a1ce.tar.gz pleroma-3a3a3996b7a37d281745586fa40bbabd5299a1ce.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 7e833fbb3..fbeba0919 100644 --- a/config/test.exs +++ b/config/test.exs @@ -36,6 +36,7 @@ config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :tesla, adapter: Tesla.Mock +config :pleroma, :rich_media, enabled: false config :web_push_encryption, :vapid_details, subject: "mailto:administrator@example.com", |