diff options
| author | Jakob Borg <jakob@kastelo.net> | 2021-04-06 10:47:00 +0200 |
|---|---|---|
| committer | Jakob Borg <jakob@kastelo.net> | 2021-04-06 10:47:00 +0200 |
| commit | 67aaeef537e053325ba105697406d53ec2ad19ad (patch) | |
| tree | b62d712b1ff6da095921a1070df4403aac398bce | |
| parent | a514b65d812569349a56f0b580db39a3ae1b3d3a (diff) | |
| parent | 13679284ac04c1e041f322e6f6ee8340c0aa33b4 (diff) | |
Merge branch 'release'
* release:
cmd/syncthing: Rename --conf back to --config
lib/db: Fix comparison of pending folder timestamps (fixes #7532) (#7535)
0 files changed, 0 insertions, 0 deletions