htdocs/install/mysql/migration/3.9.0-4.0.0.sql · 7b34859bc8cc72199aa253ac29d0c2345bcf302b · Software_Artifact_Infrastructure_Repository / dolibarr · GitLab

Snippets Groups Projects

7 years ago
25b107de
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 · 25b107de
Laurent Destailleur authored 7 years ago
```
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
```
25b107de

History
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Laurent Destailleur authored 7 years ago
```
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
```