Files
dolibarr/htdocs/compta/prelevement/class
Laurent Destailleur 9b0dce2e34 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php
2015-03-01 13:58:56 +01:00
..