Laurent Destailleur 4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php		2017-10-13 22:01:56 +02:00
..
admin	Change copyright comment	2017-08-25 16:25:40 +02:00
class	Standardize use of function getCommonSubstitutionArray	2017-10-09 14:51:42 +02:00
stats	FIX #6981	2017-10-06 14:07:28 +02:00
tpl	Suggested link for online payment use the generic link	2017-09-12 12:18:26 +02:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-13 22:01:56 +02:00
contact.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
document.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
fiche-rec.php	Various fixes	2017-10-13 12:14:57 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
invoicetemplate_list.php	Scrutinizer Auto-Fixes	2017-10-13 11:28:26 +00:00
list.php	Scrutinizer Auto-Fixes	2017-10-13 11:28:26 +00:00
note.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
prelevement.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00