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
..
canvas	Fixed: Translations	2014-12-07 18:24:45 +01:00
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
card.php	FIX translate Jabberid on contact page with edit view	2015-07-08 12:33:37 +02:00
exportimport.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +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
info.php	Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid	2015-07-19 11:21:21 +02:00
ldap.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
list.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-05-25 18:08:23 +02:00
note.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-20 23:47:09 +01:00
perso.php	Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid	2015-07-19 11:21:21 +02:00
vcard.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00