Laurent Destailleur f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php		2019-06-13 12:15:51 +02:00
..
admin	Merge branch 'develop' into 10.0_Differentiated_export	2019-05-23 11:10:07 +02:00
bookkeeping	Merge pull request #11175 from aspangaro/10.0_Differentiated_export	2019-06-12 15:42:20 +02:00
class	Merge branch '10.0' into 10.0_Differentiated_export	2019-06-12 13:27:49 +02:00
customer	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-13 12:15:51 +02:00
expensereport	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-13 12:15:51 +02:00
journal	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-13 12:15:51 +02:00
supplier	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-13 12:15:51 +02:00
tpl	Move my email to the new one	2019-01-28 21:39:22 +01:00
index.html
index.php	Replace term "Advanced accountancy" by Accountancy (Double entries)	2019-05-13 22:25:15 +02:00