Merge branch 'master' into pass-cfg-by-ref

This commit is contained in:
behouba 2019-12-22 10:36:27 +03:00
parent 5e16ffffb3
commit 32d17aa077

View file

@ -46,6 +46,7 @@ func SetupFederationAPIComponent(
routing.Setup( routing.Setup(
base.APIMux, base.Cfg, queryAPI, aliasAPI, asAPI, base.APIMux, base.Cfg, queryAPI, aliasAPI, asAPI,
roomserverProducer, *keyRing, federation, accountsDB, deviceDB, roomserverProducer, federationSenderAPI, *keyRing,
federation, accountsDB, deviceDB,
) )
} }