htdocs/index.php · 8ec1784e41d948d95d496384c885d5ce538e6ee3 · Software_Artifact_Infrastructure_Repository / dolibarr · GitLab

Snippets Groups Projects

8 years ago
db9af011
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop · db9af011
Laurent Destailleur authored 8 years ago
```
Conflicts:
	htdocs/core/modules/modAdherent.class.php
```
db9af011

History
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Laurent Destailleur authored 8 years ago
```
Conflicts:
	htdocs/core/modules/modAdherent.class.php
```