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

..

CachedObjectStorage

…

CalcEngine

…

Calculation

…

Cell

…

Chart

…

Helper

…

locale

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

2019-02-13 09:23:52 +01:00

Reader

…

RichText

…

Shared

…

Style

…

Worksheet

…

Writer

…

Autoloader.php

…

CachedObjectStorageFactory.php

…

Calculation.php

…

Cell.php

…

Chart.php

…

Comment.php

…

DocumentProperties.php

…

DocumentSecurity.php

…

Exception.php

…

HashTable.php

…

IComparable.php

…

IOFactory.php

…

NamedRange.php

…

ReferenceHelper.php

…

RichText.php

…

Settings.php

…

Style.php

…

Worksheet.php

…

WorksheetIterator.php

…