Laurent Destailleur 10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang

2013-09-04 15:13:38 +02:00

..

purchasesjournal.php

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-04 15:13:38 +02:00

sellsjournal.php

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-04 15:13:38 +02:00