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

Browse Source

Conflicts:
	.travis.yml

...

This commit is contained in:

Laurent Destailleur 2020-11-27 16:19:44 +01:00

parent 5ed2bbb204 26f07992a9

commit c6b2ee57ca

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