dolibarr/htdocs/compta/sociales/class
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
..
chargesociales.class.php QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01: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
paymentsocialcontribution.class.php Merge remote-tracking branch 'origin/3.7' into develop 2015-07-19 12:26:31 +02:00