mirror of
https://github.com/corda/corda.git
synced 2025-04-09 04:15:35 +00:00
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
Conflicts: * .ci/dev/forward-merge/Jenkinsfile
This commit is contained in:
commit
658e7217a3
2
.ci/dev/forward-merge/Jenkinsfile
vendored
2
.ci/dev/forward-merge/Jenkinsfile
vendored
@ -3,6 +3,6 @@
|
||||
forwardMerger(
|
||||
targetBranch: 'release/os/4.8',
|
||||
originBranch: 'release/os/4.7',
|
||||
slackChannel: '#build-team-automated-notifications'
|
||||
slackChannel: '#c4-forward-merge-bot-notifications',
|
||||
)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user