2
0
forked from Wavyzz/dolibarr
Files
dolibarr-fork/htdocs/install/mysql/migration
Florian HENRY 344a87f970 Merge branch 'develop' into develop_advtargetemailiing
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
..
2016-03-10 13:46:52 +01:00