florian HENRY e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/contact/consumption.php htdocs/webservices/server_productorservice.php		2019-02-13 09:23:52 +01:00
..
Classes	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
.gitattributes
.gitignore
.travis.yml
changelog.txt
composer.json	Upgrade lib escpos-php	2019-02-12 03:28:17 +01:00
install.txt
license.md