Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

Browse Source 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
This commit is contained in:
florian HENRY
2019-02-13 09:23:52 +01:00
parent 5c059c897d 42bb96dc27
commit e2d13c0e1f
27 changed files with 87 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
View File

@@ -1,6 +1,6 @@
##
## PHPExcel
##
##
## Copyright (c) 2006 - 2013 PHPExcel
##
## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol = $ # Symbol not known, should it be a € (Euro)?
##
## Excel Error Codes (For future use)
## Excel Error Codes (For future use)
##
NULL = #TYHJÄ!
DIV0 = #JAKO/0!