Merge remote-tracking branch 'origin/3.5' into develop
Conflicts: ChangeLog
No related branches found
No related tags found
Showing
- ChangeLog 3 additions, 0 deletionsChangeLog
- build/debian/control 2 additions, 2 deletionsbuild/debian/control
- build/makepack-dolibarr.pl 11 additions, 4 deletionsbuild/makepack-dolibarr.pl
- build/rpm/dolibarr_fedora.spec 1 addition, 0 deletionsbuild/rpm/dolibarr_fedora.spec
- build/rpm/dolibarr_generic.spec 1 addition, 0 deletionsbuild/rpm/dolibarr_generic.spec
- build/rpm/dolibarr_mandriva.spec 1 addition, 0 deletionsbuild/rpm/dolibarr_mandriva.spec
- build/rpm/dolibarr_opensuse.spec 1 addition, 0 deletionsbuild/rpm/dolibarr_opensuse.spec
- build/tgz/tar_exclude.txt 1 addition, 1 deletionbuild/tgz/tar_exclude.txt
- build/zip/zip_exclude.txt 1 addition, 1 deletionbuild/zip/zip_exclude.txt
- htdocs/core/modules/modFacture.class.php 1 addition, 1 deletionhtdocs/core/modules/modFacture.class.php
- htdocs/core/modules/modFournisseur.class.php 2 additions, 2 deletionshtdocs/core/modules/modFournisseur.class.php
- htdocs/product/class/product.class.php 1 addition, 0 deletionshtdocs/product/class/product.class.php
Loading
Please register or sign in to comment