Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
index f563b01d787f56e1ea7ba82e5ad8efb26dc11adb..e37c864c0dfd6719838962e4b1c80f0574450725 100644 (file)
--- a/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/sample_config.eex
@@ -12,7 +12,7 @@ config :pleroma, :instance,
 
 config :pleroma, :media_proxy,
   enabled: false,
-  redirect_on_failure: true,
+  redirect_on_failure: true
   #base_url: "https://cache.pleroma.social"
 
 # Configure your database