[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 47abbd: Fix bad merge
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 47abbd: Fix bad merge |
Date: |
Fri, 19 Oct 2018 05:45:12 -0700 |
Branch: refs/heads/8.0
Home: https://github.com/Dolibarr/dolibarr
Commit: 47abbd3eb2865907d098e97ac1d68adc707d49a6
https://github.com/Dolibarr/dolibarr/commit/47abbd3eb2865907d098e97ac1d68adc707d49a6
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-19 (Fri, 19 Oct 2018)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix bad merge
Commit: 57ad200ae50f28f95cf9e615543e6ada7e20c570
https://github.com/Dolibarr/dolibarr/commit/57ad200ae50f28f95cf9e615543e6ada7e20c570
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-19 (Fri, 19 Oct 2018)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
Fix regression in creating discount
Commit: 33cd0e84d28df5ad3023b938b7701a2bc73a7ac1
https://github.com/Dolibarr/dolibarr/commit/33cd0e84d28df5ad3023b938b7701a2bc73a7ac1
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-19 (Fri, 19 Oct 2018)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/91745491ffa3...33cd0e84d28d
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.