Files
dolibarr/htdocs/core
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
..
2013-04-10 11:03:24 +02:00
2013-03-29 21:19:22 +01:00
2013-03-13 23:05:34 +01:00
2013-04-10 20:50:05 +02:00
2013-04-09 17:18:07 +02:00