Merge branch 'main' into release/3.0.0

This commit is contained in:
John Livingston 2021-06-02 16:16:46 +02:00
commit 24c764c3a5
2 changed files with 11 additions and 1 deletions

View File

@ -19,6 +19,16 @@
* ...
## v2.3.1
### Features
* Added Dockerfile to use builtin prosody in Peertube docker installations.
### Fixes
* Fix typo: builtin prosody won't stop when desactivated.
## v2.3.0
### Features

View File

@ -207,7 +207,7 @@ Before asking for help, please use this diagnostic tool:
if (settings['chat-use-prosody'] === true) {
peertubeHelpers.logger.info('Saving settings, ensuring prosody is running')
await ensureProsodyRunning(options)
} else if (settings['chat-use-prody'] === false) {
} else if (settings['chat-use-prosody'] === false) {
peertubeHelpers.logger.info('Saving settings, ensuring prosody is not running')
await ensureProsodyNotRunning(options)
}