Laurent Destailleur 2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php

2014-12-18 10:13:25 +01:00

..

pdf_soleil.modules.php

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

2014-12-18 10:13:25 +01:00