-
- Downloads
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php
Showing
- ChangeLog 6 additions, 16 deletionsChangeLog
- build/debian/changelog 7 additions, 14 deletionsbuild/debian/changelog
- build/pad/DoliWamp.pml 4 additions, 4 deletionsbuild/pad/DoliWamp.pml
- build/pad/Dolibarr.pml 4 additions, 4 deletionsbuild/pad/Dolibarr.pml
- build/pad/pad_dolibarr.xml 4 additions, 4 deletionsbuild/pad/pad_dolibarr.xml
- build/pad/pad_doliwamp.xml 9 additions, 9 deletionsbuild/pad/pad_doliwamp.xml
- build/rpm/dolibarr_fedora.spec 1 addition, 1 deletionbuild/rpm/dolibarr_fedora.spec
- build/rpm/dolibarr_generic.spec 1 addition, 1 deletionbuild/rpm/dolibarr_generic.spec
- build/rpm/dolibarr_mandriva.spec 1 addition, 1 deletionbuild/rpm/dolibarr_mandriva.spec
- build/rpm/dolibarr_opensuse.spec 1 addition, 1 deletionbuild/rpm/dolibarr_opensuse.spec
Loading
Please register or sign in to comment