Laurent Destailleur 3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr ... into aspangaro-develop-ER_badge Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php		2015-05-15 02:44:43 +02:00
..
expensereport.class.php	Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr	2015-05-15 02:44:43 +02:00
expensereportstats.class.php	Doxygen	2015-03-17 11:23:45 +01:00
index.html	Add index.html	2015-03-07 15:14:51 +01:00