[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6d40f7: Fix regression
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6d40f7: Fix regression |
Date: |
Wed, 13 Sep 2017 13:30:55 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6d40f797d261e21e7c04d73bc872473fbeb80814
https://github.com/Dolibarr/dolibarr/commit/6d40f797d261e21e7c04d73bc872473fbeb80814
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-13 (Wed, 13 Sep 2017)
Changed paths:
M htdocs/core/lib/price.lib.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Fix regression
Commit: fed3165b53568b8fe3f7020c8942babd14c061ce
https://github.com/Dolibarr/dolibarr/commit/fed3165b53568b8fe3f7020c8942babd14c061ce
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-13 (Wed, 13 Sep 2017)
Changed paths:
M htdocs/core/lib/price.lib.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/core/lib/price.lib.php
Commit: 4b8862c1ecb9a1a56f7c3d09f1c61c0fbfe45298
https://github.com/Dolibarr/dolibarr/commit/4b8862c1ecb9a1a56f7c3d09f1c61c0fbfe45298
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-13 (Wed, 13 Sep 2017)
Changed paths:
M test/phpunit/PricesTest.php
Log Message:
-----------
Remove useless import
Commit: b3b00f63e45a635cfe5302af1604ab3c696e850b
https://github.com/Dolibarr/dolibarr/commit/b3b00f63e45a635cfe5302af1604ab3c696e850b
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-13 (Wed, 13 Sep 2017)
Changed paths:
M htdocs/core/lib/price.lib.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/eadfbfe2bdb3...b3b00f63e45a