[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d2d38f: Fix: beware with merges in co
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d2d38f: Fix: beware with merges in conflict !! |
Date: |
Thu, 17 Mar 2016 15:44:50 -0700 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: d2d38f58bf7d320b29e0047f516c4ec9a2744b9d
https://github.com/Dolibarr/dolibarr/commit/d2d38f58bf7d320b29e0047f516c4ec9a2744b9d
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: beware with merges in conflict !!
Commit: ae16d6c45cef0f9b65806af6c2c979ae5dcf8d2a
https://github.com/Dolibarr/dolibarr/commit/ae16d6c45cef0f9b65806af6c2c979ae5dcf8d2a
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: missing color update
Commit: a2bb57e33b4e1d544c1ec46e938402bb833110e4
https://github.com/Dolibarr/dolibarr/commit/a2bb57e33b4e1d544c1ec46e938402bb833110e4
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: use clone instead dol_clone
Commit: bbcc7d83ea17fbe99a83abfde4309111ab379094
https://github.com/Dolibarr/dolibarr/commit/bbcc7d83ea17fbe99a83abfde4309111ab379094
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #4834 from hregis/3.9_bug
Fix: beware with merges in conflict !!
Compare:
https://github.com/Dolibarr/dolibarr/compare/e5f0027dbf35...bbcc7d83ea17
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] d2d38f: Fix: beware with merges in conflict !!,
Laurent Destailleur <=