Regis Houssin 2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql		2017-08-22 18:49:40 +02:00
..
ajax	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
class	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
payment	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 21:54:37 +02:00
stats	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
tpl	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
card.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
document.php	FIX #6945	2017-06-06 10:53:53 +02:00
export_csv.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
index.html	Add index.html	2015-03-07 15:14:51 +01:00
index.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
info.php	bottom-border useless	2017-03-21 18:00:11 +01:00
list.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
note.php	bottom-border useless	2017-03-21 18:00:11 +01:00