Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
..
2015-12-09 13:28:36 +01:00
2015-12-09 13:28:36 +01:00
2015-12-09 13:28:36 +01:00
2015-12-09 13:28:36 +01:00
2015-12-09 13:28:36 +01:00
2015-06-08 18:28:50 +02:00
2016-09-30 11:45:36 +02:00
2016-10-24 13:10:35 +02:00
2016-11-06 15:01:40 +01:00
2016-11-06 15:01:40 +01:00
2016-10-29 17:16:14 +02:00