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

Browse Source

wdammak-develop

# Conflicts:
#	htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php

...

This commit is contained in:

Laurent Destailleur 2019-02-12 16:58:55 +01:00

parent 2fdd92978e

commit 0d8447ad39

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files