5 Commits

Author	SHA1	Message	Date
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
Laurent Destailleur	f69f574eff	Upgrade lib escpos-php	2019-02-12 03:28:17 +01:00
Laurent Destailleur	8c53921b5f	CRLF	2016-07-15 17:22:27 +02:00
Laurent Destailleur	a8f06d78b1	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/install/pgsql/functions/functions.sql	2016-07-06 14:53:05 +02:00
Raphaël Doursenaud	1b7ed43c60	Install PHPExcel from composer	2015-09-04 19:06:02 +02:00