Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
..
2016-08-09 13:26:08 +02:00
2016-03-25 15:34:37 +01:00
2016-06-04 11:52:36 +02:00
2016-03-25 15:53:44 +01:00
2016-09-06 21:06:33 +02:00
2016-04-17 15:24:22 +02:00
2015-04-19 03:05:37 +02:00
2016-04-02 14:16:16 +02:00
2016-05-17 23:19:57 +02:00
2015-12-11 14:19:38 +01:00
2016-09-02 14:47:59 +02:00
2016-06-20 10:22:08 +02:00
2016-08-01 16:04:49 +02:00