Laurent Destailleur
7b7d27920d
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
..
2015-08-26 11:26:00 +02:00
2015-10-05 19:41:41 +02:00
2015-10-10 18:56:28 +02:00
2015-08-10 15:10:58 +02:00
2015-05-12 15:37:35 +02:00
2015-07-02 13:45:32 +02:00
2015-10-08 09:34:02 +02:00
2015-05-29 10:09:18 +02:00
2015-10-05 10:30:49 +02:00
2015-10-08 09:34:02 +02:00
2015-09-18 20:43:10 +02:00
2015-08-15 02:34:15 +02:00
2015-07-28 14:13:16 +02:00
2015-07-19 12:26:31 +02:00
2015-10-01 16:50:18 +02:00
2015-02-28 04:59:27 +01:00
2015-05-05 04:10:42 +02:00
2015-02-28 03:11:15 +01:00
2015-03-06 02:10:01 +00:00
2015-03-24 11:19:51 +01:00
2015-06-27 11:45:23 +02:00
2015-06-22 15:48:48 +02:00