Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts: htdocs/compta/facture.php
No related branches found
No related tags found
Showing
- htdocs/comm/propal/card.php 1 addition, 0 deletionshtdocs/comm/propal/card.php
- htdocs/commande/card.php 1 addition, 0 deletionshtdocs/commande/card.php
- htdocs/compta/facture/card.php 1 addition, 0 deletionshtdocs/compta/facture/card.php
- htdocs/langs/en_US/orders.lang 1 addition, 0 deletionshtdocs/langs/en_US/orders.lang
- htdocs/langs/en_US/propal.lang 1 addition, 0 deletionshtdocs/langs/en_US/propal.lang
Loading
Please register or sign in to comment