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

Browse Source

develop

Conflicts:
	htdocs/websites/index.php

...

This commit is contained in:

Laurent Destailleur 2016-09-16 01:23:54 +02:00

parent 72aacb81ae a97161b044

commit d0136f5c85

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