Laurent Destailleur 94335b186e Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php

2014-05-21 20:30:07 +02:00

..

doc

Add version of phpunit into travis script.

2014-05-01 19:17:45 +02:00

mod_arctic.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

mod_pacific.php

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

2014-05-21 20:30:07 +02:00

modules_fichinter.php

Removed closing php tag

2014-05-03 18:18:44 +02:00