-
- Downloads
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Conflicts: ChangeLog
Branches 3.3_backported
No related tags found
Showing
- ChangeLog 7 additions, 0 deletionsChangeLog
- build/README 47 additions, 23 deletionsbuild/README
- build/debian/changelog 2 additions, 2 deletionsbuild/debian/changelog
- build/debian/dolibarr.install 0 additions, 1 deletionbuild/debian/dolibarr.install
- build/exe/doliwamp/doliwamp.iss 1018 additions, 1023 deletionsbuild/exe/doliwamp/doliwamp.iss
- build/makepack-dolibarr.pl 250 additions, 94 deletionsbuild/makepack-dolibarr.pl
- build/pad/pad_dolibarr.xml 4 additions, 4 deletionsbuild/pad/pad_dolibarr.xml
- build/pad/pad_doliwamp.xml 4 additions, 4 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
- dev/dolibarr_changes.txt 5 additions, 0 deletionsdev/dolibarr_changes.txt
- htdocs/admin/modules.php 2 additions, 1 deletionhtdocs/admin/modules.php
- htdocs/core/class/doleditor.class.php 2 additions, 1 deletionhtdocs/core/class/doleditor.class.php
- htdocs/core/modules/modFckeditor.class.php 2 additions, 0 deletionshtdocs/core/modules/modFckeditor.class.php
- htdocs/filefunc.inc.php 1 addition, 1 deletionhtdocs/filefunc.inc.php
- htdocs/includes/jquery/plugins/jcrop/index.html 0 additions, 15 deletionshtdocs/includes/jquery/plugins/jcrop/index.html
- htdocs/main.inc.php 7 additions, 2 deletionshtdocs/main.inc.php
- test/phpunit/AdherentTest.php 1 addition, 1 deletiontest/phpunit/AdherentTest.php
Loading
Please register or sign in to comment