Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php
No related branches found
No related tags found
Showing
- build/exe/doliwamp/doliwamp.iss 5 additions, 3 deletionsbuild/exe/doliwamp/doliwamp.iss
- htdocs/comm/propal/list.php 1 addition, 0 deletionshtdocs/comm/propal/list.php
- htdocs/commande/card.php 1 addition, 1 deletionhtdocs/commande/card.php
- htdocs/commande/list.php 1 addition, 0 deletionshtdocs/commande/list.php
- htdocs/compta/facture/list.php 1 addition, 0 deletionshtdocs/compta/facture/list.php
- htdocs/contrat/class/contrat.class.php 2 additions, 2 deletionshtdocs/contrat/class/contrat.class.php
- htdocs/contrat/list.php 7 additions, 0 deletionshtdocs/contrat/list.php
- htdocs/core/class/html.form.class.php 8 additions, 0 deletionshtdocs/core/class/html.form.class.php
- htdocs/core/class/smtps.class.php 26 additions, 23 deletionshtdocs/core/class/smtps.class.php
- htdocs/core/lib/files.lib.php 1 addition, 0 deletionshtdocs/core/lib/files.lib.php
- htdocs/core/lib/functions.lib.php 44 additions, 7 deletionshtdocs/core/lib/functions.lib.php
- htdocs/fichinter/list.php 7 additions, 0 deletionshtdocs/fichinter/list.php
- htdocs/fourn/facture/list.php 1 addition, 0 deletionshtdocs/fourn/facture/list.php
- htdocs/install/mysql/migration/3.9.0-4.0.0.sql 3 additions, 1 deletionhtdocs/install/mysql/migration/3.9.0-4.0.0.sql
- htdocs/install/mysql/tables/llx_user.sql 1 addition, 1 deletionhtdocs/install/mysql/tables/llx_user.sql
- test/phpunit/FunctionsLibTest.php 66 additions, 1 deletiontest/phpunit/FunctionsLibTest.php
Loading
Please register or sign in to comment