dolibarr/htdocs/adherents
Laurent Destailleur 89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
2018-12-18 21:55:14 +01:00
..
admin Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
canvas FIX change my deprecated email 2018-10-27 14:43:12 +02:00
cartes Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
class Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
stats FIX change my deprecated email 2018-10-27 14:43:12 +02:00
subscription FIX Look and feel v8 2018-12-09 23:41:59 +01:00
tpl FIX change my deprecated email 2018-10-27 14:43:12 +02:00
agenda.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
card.php cats may be int or array 2018-12-02 10:33:23 +01:00
document.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
htpasswd.php standardize 2018-07-28 14:29:28 +02:00
index.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
ldap.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
list.php FIX Look and feel v8 2018-12-09 23:41:59 +01:00
note.php Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
subscription.php Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
type_ldap.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
type.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00