Laurent Destailleur 5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang		2018-06-26 01:25:03 +02:00
..
admin	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-26 01:25:03 +02:00
bookkeeping	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
class	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 15:02:24 +02:00
customer	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-18 14:46:30 +02:00
expensereport	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-18 14:46:30 +02:00
journal	Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)	2018-06-05 20:37:39 +02:00
supplier	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-18 14:46:30 +02:00
tpl	Fix export balance	2018-04-15 07:49:54 +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
index.php	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00