Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
..
2014-07-12 23:18:57 +02:00
2015-02-14 16:18:18 +01:00
2015-02-14 16:18:18 +01:00
2014-08-17 17:47:25 +02:00
2014-08-03 11:17:24 +02:00
2015-04-01 16:07:22 +02:00
2014-07-06 21:25:25 +02:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2014-08-12 06:03:27 +02:00
2015-01-31 12:19:06 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2014-11-16 23:56:10 +01:00
2015-03-04 23:04:37 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-03-23 17:34:23 +01:00
2014-07-24 10:26:11 +02:00
2015-03-15 23:39:53 +01:00
2015-04-14 16:33:56 +02:00
2013-12-01 16:01:33 +01:00
2015-02-15 22:49:23 +01:00
2014-07-11 17:43:57 +02:00
2015-03-01 12:42:38 +01:00
2015-01-18 03:20:35 +01:00