Merge remote-tracking branch 'upstream/develop' into hide-reactions

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 1dc196a6b2a96a6c284b73b3131ab767a2a54b4e..857e0afbbeebe9f62e532cfaaa6f78120b226b2f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -252,7 +252,8 @@ config :pleroma, :instance,
       number: 5,
       length: 16
     ]
-  ]
+  ],
+  show_reactions: true
 
 config :pleroma, :welcome,
   direct_message: [
@@ -647,6 +648,16 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
 
 config :pleroma, :static_fe, enabled: false
 
+# Example of frontend configuration
+# This example will make us serve the primary frontend from the
+# frontends directory within your `:pleroma, :instance, static_dir`.
+# e.g., instance/static/frontends/pleroma/develop/
+#
+# With no frontend configuration, the bundled files from the `static` directory will
+# be used.
+#
+# config :pleroma, :frontends, primary: %{"name" => "pleroma", "ref" => "develop"}
+
 config :pleroma, :web_cache_ttl,
   activity_pub: nil,
   activity_pub_question: 30_000