[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1978ee: Fix bad merge
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1978ee: Fix bad merge |
|
Date: |
Sun, 13 Dec 2015 08:34:14 -0800 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: 1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b
https://github.com/Dolibarr/dolibarr/commit/1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix bad merge
Commit: e37fc87cd5dc35838d5e06f8c56169d4e55aced1
https://github.com/Dolibarr/dolibarr/commit/e37fc87cd5dc35838d5e06f8c56169d4e55aced1
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Compare:
https://github.com/Dolibarr/dolibarr/compare/4b741c6b9c6c...e37fc87cd5dc