[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b0ab71: Fix: merge problem
From: |
Regis Houssin |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b0ab71: Fix: merge problem |
Date: |
Mon, 02 Jul 2012 13:47:47 -0700 |
Branch: refs/heads/3.2.1
Home: https://github.com/Dolibarr/dolibarr
Commit: b0ab71db5f260d114ed0c3f60b1038db8f974051
https://github.com/Dolibarr/dolibarr/commit/b0ab71db5f260d114ed0c3f60b1038db8f974051
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: merge problem
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] b0ab71: Fix: merge problem,
Regis Houssin <=