projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refactor/user' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 4c758d4a04e8c88b75919deda5cc0c9d1ce6da73..403ade60d1a771739cf3c3dc8d2d0089409fb0cd 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-109,6
+109,7
@@
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
+ streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
config :pleroma, Pleroma.Uploaders.MDII,
public_endpoint: "https://s3.amazonaws.com"
config :pleroma, Pleroma.Uploaders.MDII,
@@
-508,7
+509,7
@@
config :auto_linker,
class: false,
strip_prefix: false,
new_window: false,
class: false,
strip_prefix: false,
new_window: false,
- rel:
false
+ rel:
"ugc"
]
config :pleroma, :ldap,
]
config :pleroma, :ldap,