build/rpm/dolibarr_mandriva.spec · 8d405a147f12b850db438ae4a137b8098291500e · Software_Artifact_Infrastructure_Repository / dolibarr · GitLab

Snippets Groups Projects

10 years ago
8d405a14
Merge remote-tracking branch 'origin/3.6' into 3.7 · 8d405a14
Laurent Destailleur authored 10 years ago
```
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
```
8d405a14

History
Merge remote-tracking branch 'origin/3.6' into 3.7
Laurent Destailleur authored 10 years ago
```
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
```