Laurent Destailleur fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php

2013-05-03 00:15:02 +02:00

..

doc

Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING)

2013-04-26 08:48:43 +02:00

mod_codeclient_elephant.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mod_codeclient_leopard.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mod_codeclient_monkey.php

fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired

2013-04-28 19:35:10 +02:00

mod_codecompta_aquarium.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mod_codecompta_panicum.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modules_societe.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00