summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-08 12:37:06 +0100
committerlain <lain@soykaf.club>2018-03-08 12:37:06 +0100
commit611ca385dea3d611a97579000311cc42684305e6 (patch)
treef56c298bed6b289aa2dd81766862265ccef05947 /config
parent8228ae96d87fa9a8dc6c2603767ab8f094703e9e (diff)
parent0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4 (diff)
downloadpleroma-611ca385dea3d611a97579000311cc42684305e6.tar.gz
pleroma-611ca385dea3d611a97579000311cc42684305e6.zip
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index e6c695215..bd714a189 100644
--- 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,