Laurent Destailleur c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php

2015-03-11 03:29:52 +01:00

..

class

Fix: Pb of object with wrong type.

2014-11-15 18:24:38 +01:00

card.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-03-11 03:29:52 +01:00

index.php

Update /compta/salaries/index.php

2014-11-23 17:44:37 +01:00