[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0aeb27: Fix merge
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0aeb27: Fix merge |
|
Date: |
Sat, 29 Jun 2019 14:27:00 -0700 |
Branch: refs/heads/10.0
Home: https://github.com/Dolibarr/dolibarr
Commit: 0aeb27ba9707fca4849d7698bb4f009c32a80ae6
https://github.com/Dolibarr/dolibarr/commit/0aeb27ba9707fca4849d7698bb4f009c32a80ae6
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-29 (Sat, 29 Jun 2019)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix merge
Commit: 6537faa35eb00d00e6201c794e89f840a4a3beae
https://github.com/Dolibarr/dolibarr/commit/6537faa35eb00d00e6201c794e89f840a4a3beae
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-29 (Sat, 29 Jun 2019)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix merge
Commit: 0d6900f870c219e92621bdae33fae2b25575b290
https://github.com/Dolibarr/dolibarr/commit/0d6900f870c219e92621bdae33fae2b25575b290
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-29 (Sat, 29 Jun 2019)
Changed paths:
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/makepack-dolibarr.pl
Compare:
https://github.com/Dolibarr/dolibarr/compare/2cefe638ef0a...0d6900f870c2