Laurent Destailleur c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php		2017-08-26 22:33:56 +02:00
..
ajaxik.php	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
ajaxprojet.php	Fix: change old email	2017-08-23 21:23:18 +02:00
index.html	Add index.html	2015-03-07 15:14:51 +01:00