Merge branch 'develop' into feature/activitypub

2018-03-08 12:37:06 +01:00 · 2018-03-08 12:37:06 +01:00 · 611ca385de
commit 611ca385de
parent 8228ae96d8 0f2bf3eefb
5 changed files with 38 additions and 24 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -50,7 +50,8 @@ config :pleroma, :instance,
  name: "Pleroma",
  email: "example@example.com",
  limit: 5000,
-  registrations_open: true
+  registrations_open: true,
+  federating: true

 config :pleroma, :media_proxy,
  enabled: false,