summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
commit38245f13367cdc2df29ff2a499418e526b654fb5 (patch)
tree514724023f061f56e42fcaa7ae79f07d3d055c58 /config/test.exs
parentd4ed3a35b8aa34cd968113970bbab445eb251703 (diff)
parentfd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff)
downloadpleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz
pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.zip
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index df512b5d7..da2778aa7 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -30,7 +30,8 @@ config :pleroma, :instance,
notify_email: "noreply@example.com",
skip_thread_containment: false,
federating: false,
- external_user_synchronization: false
+ external_user_synchronization: false,
+ static_dir: "test/instance_static/"
config :pleroma, :activitypub, sign_object_fetches: false