|
@ -223,7 +223,7 @@ |
|
|
- myc 14.0 |
|
|
- myc 14.0 |
|
|
./report-engine: |
|
|
./report-engine: |
|
|
defaults: |
|
|
defaults: |
|
|
depth: $DEPTH_MERGE |
|
|
|
|
|
|
|
|
depth: $DEPTH_DEFAULT |
|
|
remotes: |
|
|
remotes: |
|
|
oca: https://github.com/OCA/reporting-engine.git |
|
|
oca: https://github.com/OCA/reporting-engine.git |
|
|
myc: ssh://git@git.myceliandre.fr:5022/OCA/reporting-engine.git |
|
|
myc: ssh://git@git.myceliandre.fr:5022/OCA/reporting-engine.git |
|
@ -776,3 +776,11 @@ |
|
|
target: origin 14.0 |
|
|
target: origin 14.0 |
|
|
merges: |
|
|
merges: |
|
|
- origin 14.0 |
|
|
- origin 14.0 |
|
|
|
|
|
./vertical-cooperative: |
|
|
|
|
|
defaults: |
|
|
|
|
|
depth: $DEPTH_DEFAULT |
|
|
|
|
|
remotes: |
|
|
|
|
|
origin: https://git.myceliandre.fr/njeudy/vertical-cooperative.git |
|
|
|
|
|
target: origin 14.0-MIG-INITIAL |
|
|
|
|
|
merges: |
|
|
|
|
|
- origin 14.0-MIG-INITIAL |