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
..
bg
cs	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
da	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
de	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
en/uk	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
es	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
fi	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
fr	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
hu	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
it	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
nl	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
no	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
pl	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
pt	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
ru	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
sv	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00
tr	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2019-02-13 09:23:52 +01:00