Laurent Destailleur 06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php		2019-06-25 13:03:54 +02:00
..
admin	Restore official text of licence	2019-06-24 18:30:07 +02:00
canvas	update with html5 compliant code	2019-03-19 13:51:19 +01:00
cartes	CSS	2019-03-10 20:59:50 +01:00
class	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
stats	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
subscription	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-25 13:03:54 +02:00
tpl	Fix phpcs	2019-05-23 14:25:16 +02:00
agenda.php	Update agenda.php	2019-05-19 09:13:46 +02:00
card.php	Merge pull request #11107 from gentooza/develop	2019-06-24 19:20:36 +02:00
document.php	Fix conflict in a translation key	2019-06-24 17:59:00 +02:00
htpasswd.php	Fix phpcs	2019-05-23 14:25:16 +02:00
index.php	FIX hook	2019-06-18 15:13:08 +02:00
ldap.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
list.php	add missing column adherent list	2019-06-10 10:10:16 +02:00
note.php	Fix conflict in a translation key	2019-06-24 17:59:00 +02:00
subscription.php	Fix bad id	2019-06-25 11:09:13 +02:00
type_ldap.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
type.php	Fix conflict in a translation key	2019-06-24 17:59:00 +02:00