mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-08-01 13:52:46 +00:00
Merge branch 'master' into nats
This commit is contained in:
commit
95476d36ca
28 changed files with 489 additions and 60 deletions
|
@ -17,7 +17,7 @@ func main() {
|
|||
flag.Parse()
|
||||
|
||||
cfg := &config.Dendrite{}
|
||||
cfg.Defaults()
|
||||
cfg.Defaults(true)
|
||||
if *serverName != "" {
|
||||
cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue