Laurent Destailleur 2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/prelevement/class/rejetprelevement.class.php htdocs/compta/sociales/class/paymentsocialcontribution.class.php htdocs/contact/exportimport.php htdocs/contact/ldap.php htdocs/contact/perso.php htdocs/contact/vcard.php htdocs/core/class/commonobject.class.php htdocs/product/reassort.php htdocs/projet/liste.php htdocs/societe/consumption.php htdocs/societe/info.php		2015-07-19 12:04:30 +02:00
..
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
charges.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-05-25 18:08:23 +02:00
document.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
index.php	Update /compta/sociales/index.php	2014-11-23 17:44:25 +01:00
info.php	Removed closing php tag	2014-05-03 18:18:44 +02:00