Merge branch 'master' into traefik

housekeeping^2
Slavi Pantaleev 2 years ago
commit a5afa4eac9

@ -81,7 +81,7 @@ matrix_bot_draupnir_management_room: "ROOM_ID_FROM_STEP_4_GOES_HERE"
## 5b. Migrating from Mjolnir (Only required if migrating.) ## 5b. Migrating from Mjolnir (Only required if migrating.)
Replace your matrix_bot_mjolnir config with matrix_bot_draupnir config. Also disable mjolnir if you're doing migration. Replace your `matrix_bot_mjolnir` config with `matrix_bot_draupnir` config. Also disable mjolnir if you're doing migration.
That is all you need to do due to that Draupnir can complete migration on its own. That is all you need to do due to that Draupnir can complete migration on its own.
## 6. Installing ## 6. Installing

@ -99,7 +99,7 @@ When you're done with all the configuration you'd like to do, continue with [Ins
- [Setting up Matrix Corporal](configuring-playbook-matrix-corporal.md) (optional, advanced) - [Setting up Matrix Corporal](configuring-playbook-matrix-corporal.md) (optional, advanced)
- [Matrix User Verification Service](docs/configuring-playbook-user-verification-service.md) (optional, advanced) - [Matrix User Verification Service](configuring-playbook-user-verification-service.md) (optional, advanced)
### Bridging other networks ### Bridging other networks

Loading…
Cancel
Save