fhenry 2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/modules/mailings/thirdparties_services_expired.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/opensurvey/fonctions.php htdocs/opensurvey/public/choix_date.php htdocs/opensurvey/public/create_survey.php htdocs/opensurvey/public/exportcsv.php htdocs/public/paybox/paymentko.php Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea		2013-04-11 10:04:27 +02:00
..
index.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
newpayment.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
paymentko.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2013-04-11 10:04:27 +02:00
paymentok.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2013-04-11 10:04:27 +02:00