Merge branch 'ruma-registration-type' into 'next'
fix: don't panic if registration url is empty See merge request famedly/conduit!583
This commit is contained in:
commit
9176474513
15 changed files with 299 additions and 231 deletions
|
@ -57,7 +57,7 @@ impl Services {
|
|||
config: Config,
|
||||
) -> Result<Self> {
|
||||
Ok(Self {
|
||||
appservice: appservice::Service { db },
|
||||
appservice: appservice::Service::build(db)?,
|
||||
pusher: pusher::Service { db },
|
||||
rooms: rooms::Service {
|
||||
alias: rooms::alias::Service { db },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue