Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/filefunc.inc.php
No related branches found
No related tags found
Showing
- ChangeLog 36 additions, 0 deletionsChangeLog
- htdocs/admin/facture.php 2 additions, 2 deletionshtdocs/admin/facture.php
- htdocs/compta/bank/categ.php 1 addition, 1 deletionhtdocs/compta/bank/categ.php
- htdocs/compta/facture/fiche-rec.php 6 additions, 0 deletionshtdocs/compta/facture/fiche-rec.php
- htdocs/core/class/CMailFile.class.php 51 additions, 32 deletionshtdocs/core/class/CMailFile.class.php
- htdocs/core/class/html.formfile.class.php 5 additions, 0 deletionshtdocs/core/class/html.formfile.class.php
- htdocs/core/class/smtps.class.php 41 additions, 9 deletionshtdocs/core/class/smtps.class.php
- htdocs/core/menus/standard/eldy.lib.php 3 additions, 2 deletionshtdocs/core/menus/standard/eldy.lib.php
- htdocs/install/repair.php 67 additions, 9 deletionshtdocs/install/repair.php
- htdocs/langs/en_US/admin.lang 1 addition, 1 deletionhtdocs/langs/en_US/admin.lang
- htdocs/langs/en_US/categories.lang 1 addition, 0 deletionshtdocs/langs/en_US/categories.lang
- htdocs/product/stock/class/mouvementstock.class.php 2 additions, 2 deletionshtdocs/product/stock/class/mouvementstock.class.php
Loading
Please register or sign in to comment