Laurent Destailleur 4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php		2017-04-15 17:02:05 +02:00
..
admin	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
class	var to public	2016-12-23 14:21:15 -03:00
establishment	Fix hrm module	2016-08-31 18:57:27 +02:00
index.html
index.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-15 17:02:05 +02:00