[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 39a727: Fix bad merge
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 39a727: Fix bad merge |
Date: |
Thu, 05 Mar 2015 02:14:14 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 39a7271f910b8de71003b8eee910069fd06f012d
https://github.com/Dolibarr/dolibarr/commit/39a7271f910b8de71003b8eee910069fd06f012d
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M htdocs/includes/tcpdi/fpdf_tpl.php
Log Message:
-----------
Fix bad merge
Commit: c36f92396b03890be7367a1398c48dc06ccda990
https://github.com/Dolibarr/dolibarr/commit/c36f92396b03890be7367a1398c48dc06ccda990
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/langs/en_US/projects.lang
M htdocs/main.inc.php
M htdocs/projet/activity/perday.php
Log Message:
-----------
Add navigation into the new timesheet week page.
Fix bad merge
Commit: e431e24889754cfdd2137f3a5dcb6457e3d09dc8
https://github.com/Dolibarr/dolibarr/commit/e431e24889754cfdd2137f3a5dcb6457e3d09dc8
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/ec4c1a493f1e...e431e2488975
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 39a727: Fix bad merge,
Laurent Destailleur <=