Laurent Destailleur 2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/contact/exportimport.php htdocs/contact/info.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modSociete.class.php htdocs/core/tpl/document_actions_pre_headers.tpl.php htdocs/langs/fr_FR/categories.lang htdocs/main.inc.php htdocs/product/reassort.php htdocs/projet/list.php htdocs/societe/info.php		2015-07-19 12:26:31 +02:00
..
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
paypal.lib.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-07-19 12:26:31 +02:00
paypalfunctions.lib.php	Removed closing php tag	2014-05-03 18:18:44 +02:00