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
..
2015-07-19 12:04:30 +02:00
2014-09-18 21:18:25 +02:00
2015-04-19 01:55:35 +02:00
2014-12-09 11:19:16 +01:00
2014-11-05 17:32:42 +01:00
2014-11-05 16:21:17 +01:00
2014-10-04 17:20:17 +02:00
2014-12-09 11:19:16 +01:00
2014-10-04 17:20:17 +02:00
2014-12-09 11:19:16 +01:00
2014-12-09 11:19:16 +01:00
2014-11-23 17:44:16 +01:00
2014-09-18 21:18:25 +02:00
2014-12-09 11:19:16 +01:00