htdocs/filefunc.inc.php · a0de94ae0963d672145d3273e2552dc99c77d169 · Software_Artifact_Infrastructure_Repository / dolibarr · GitLab

Snippets Groups Projects

7 years ago
e5c898e0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop · e5c898e0
Laurent Destailleur authored 7 years ago
```
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
```
e5c898e0

History
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Laurent Destailleur authored 7 years ago
```
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
```