Merge branch 'main' into release/3.0.0
This commit is contained in:
commit
24c764c3a5
10
CHANGELOG.md
10
CHANGELOG.md
@ -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
|
## v2.3.0
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
@ -207,7 +207,7 @@ Before asking for help, please use this diagnostic tool:
|
|||||||
if (settings['chat-use-prosody'] === true) {
|
if (settings['chat-use-prosody'] === true) {
|
||||||
peertubeHelpers.logger.info('Saving settings, ensuring prosody is running')
|
peertubeHelpers.logger.info('Saving settings, ensuring prosody is running')
|
||||||
await ensureProsodyRunning(options)
|
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')
|
peertubeHelpers.logger.info('Saving settings, ensuring prosody is not running')
|
||||||
await ensureProsodyNotRunning(options)
|
await ensureProsodyNotRunning(options)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user