diff --git a/CHANGELOG b/CHANGELOG index 2debde4..4f525db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -633,3 +633,9 @@ * The handling of conflict resolution involving deleted files has changed. A delete can now be the winning outcome of conflict resolution, resulting in the deleted file being moved to a conflict copy. * fix(cmd): restore --version flag for compatibility by [@acolomb](https://github.com/acolomb) in https://github.com/syncthing/syncthing/pull/10269 +[1.33.5] +* Update syncthing to 2.0.4 +* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.4) +* fix(cmd): only start temporary API server during migration if it's enabled by [@pixelspark](https://github.com/pixelspark) in https://github.com/syncthing/syncthing/pull/10284 +* fix(model): consider MaxFolderConcurrency when calculating number of hashers by [@tomasz1986](https://github.com/tomasz1986) in https://github.com/syncthing/syncthing/pull/10285 + diff --git a/CloudronManifest.json b/CloudronManifest.json index 2f58dc4..a723732 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,7 +5,7 @@ "description": "file://DESCRIPTION.md", "changelog": "file://CHANGELOG", "tagline": "Decentralized file synchronization", - "version": "1.33.4", + "version": "1.33.5", "upstreamVersion": "2.0.4", "healthCheckPath": "/healthcheck", "httpPort": 8000,