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
..
2014-11-05 16:37:07 +01:00
2014-10-04 17:20:17 +02:00
2015-04-22 19:25:20 +02:00
2015-03-04 18:18:55 +01:00
2015-04-29 19:57:01 +02:00
2015-05-07 13:28:03 +02:00
2015-07-19 12:04:30 +02:00
2014-11-28 02:20:01 +01:00
2015-03-04 18:18:55 +01:00
2015-02-24 17:16:17 +01:00
2015-03-04 18:18:55 +01:00
2014-10-04 17:20:17 +02:00
2015-02-03 13:05:28 +01:00
2015-02-03 13:05:28 +01:00
2014-10-04 17:20:17 +02:00
2015-03-14 12:35:03 +01:00
2015-05-06 23:31:03 +02:00
2014-09-28 02:14:32 +02:00
2014-11-05 16:23:10 +01:00
2015-03-14 13:46:18 +01:00
2015-03-04 18:18:55 +01:00
2015-03-04 18:18:55 +01:00
2015-03-21 01:22:05 +01:00
2015-07-03 11:35:11 +02:00
2015-02-03 06:39:44 +01:00
2015-04-30 17:20:53 +02:00
2015-03-26 11:23:21 +01:00
2014-10-12 01:59:21 +02:00
2015-06-01 21:34:21 +02:00
2015-05-05 12:45:38 +02:00
2015-05-10 23:46:34 +02:00
2015-01-18 03:12:46 +01:00
2015-05-05 12:45:38 +02:00
2015-05-05 12:45:38 +02:00
2015-02-17 00:04:31 +01:00
2014-12-04 13:20:56 +01:00
2014-10-03 02:00:50 +02:00
2015-02-09 17:19:20 +01:00
2015-05-01 15:58:36 +02:00
2015-05-05 12:45:38 +02:00
2014-09-28 02:14:32 +02:00
2014-10-03 02:00:50 +02:00
2015-07-19 12:04:30 +02:00
2014-11-30 15:24:39 +01:00
2015-06-24 18:29:29 +02:00