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

Browse Source

develop

Conflicts:
	htdocs/core/ajax/objectonoff.php

...

This commit is contained in:

Laurent Destailleur 2020-04-13 15:14:35 +02:00

parent 73f2132dca ceab7f9ce3

commit c3b11561eb

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

Diff Content Not Available