Laurent Destailleur 910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang		2018-06-13 23:07:30 +02:00
..
admin	loadlangs	2018-05-27 09:27:09 +02:00
class	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-13 23:07:30 +02:00
stats	loadlangs	2018-05-27 09:40:17 +02:00
tpl	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +02:00
card.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-13 23:07:30 +02:00
contact.php	loadlangs	2018-05-27 09:27:09 +02:00
document.php	loadlangs	2018-05-27 09:27:09 +02:00
fiche-rec.php	loadlangs	2018-05-27 09:27:09 +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	loadlangs	2018-05-27 09:27:09 +02:00
invoicetemplate_list.php	loadlangs	2018-05-27 09:27:09 +02:00
list.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-13 23:07:30 +02:00
note.php	loadlangs	2018-05-27 09:27:09 +02:00
prelevement.php	loadlangs	2018-05-27 09:27:09 +02:00