[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2d571b: Fix bad merge
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2d571b: Fix bad merge |
Date: |
Wed, 14 Jun 2017 01:53:09 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2d571bf097188e258f59725bc0b057c8ed256822
https://github.com/Dolibarr/dolibarr/commit/2d571bf097188e258f59725bc0b057c8ed256822
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-14 (Wed, 14 Jun 2017)
Changed paths:
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix bad merge
Commit: b8dd7fb9588b55052a30fe8bb285d61d54fc6bf9
https://github.com/Dolibarr/dolibarr/commit/b8dd7fb9588b55052a30fe8bb285d61d54fc6bf9
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-14 (Wed, 14 Jun 2017)
Changed paths:
M htdocs/modulebuilder/template/class/actions_mymodule.class.php
Log Message:
-----------
Fix phpcs
Compare:
https://github.com/Dolibarr/dolibarr/compare/b889db997a0e...b8dd7fb9588b
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 2d571b: Fix bad merge,
Laurent Destailleur <=