Regis Houssin a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql		2017-09-14 12:07:19 +02:00
..
clientfourn.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-09-14 12:07:19 +02:00
index.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-09-14 12:07:19 +02:00
result.php	Fix default value of filter	2017-09-12 13:52:19 +02:00