Merge branch 'release'

* release:
  cmd/syncthing: Rename --conf back to --config
  lib/db: Fix comparison of pending folder timestamps (fixes #7532) (#7535)
This commit is contained in:
Jakob Borg 2021-04-06 10:47:00 +02:00
commit 67aaeef537

Diff Content Not Available