htdocs/install/fileconf.php · 5ea9fc7467f22281c5525f18055ead800e85fb98 · Software_Artifact_Infrastructure_Repository / dolibarr · GitLab

Snippets Groups Projects

8 years ago
0debcf74
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop · 0debcf74
Laurent Destailleur authored 8 years ago
```
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
```
0debcf74

History
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Laurent Destailleur authored 8 years ago
```
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
```