Skip to content

Commit 63cbe37

Browse files
committed
Update changelog
1 parent 98a4d6b commit 63cbe37

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

CHANGELOG.md

100644100755
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
## RECENT CHANGES
22

3-
### dd Mmm YYYY: To be done
3+
### Current master
44

55
- Make --log-conflicts non experimental (randomly fails)
66
- ! new option FORCE_CONFLICT_PREVALANCE which will always use Initiator or Target, regardless of best time
77
- ! target-helper: destination mails etc on target, also, no cmd after on configs
88

9-
### dd Mmm YYYY: osync v1.3 release (for full changelog since v1.2 branch see all v1.3-beta/RC entries)
9+
### 16 June 2023: osync v1.3 release (for full changelog since v1.2 branch see all v1.3-beta/RC entries)
1010

11+
- Fix for new RSYNC protocol
1112
- New options ALWAYS_SEND_MAILS to allow sending logs regardless of execution states
1213

1314
### 29 June 2020: osync v1.3-RC1 release

0 commit comments

Comments
 (0)