Merge remote-tracking branch 'origin/3.5' into develop
Conflicts: htdocs/fourn/commande/fiche.php htdocs/langs/es_ES/admin.lang htdocs/langs/es_ES/languages.lang htdocs/langs/es_ES/main.lang
No related branches found
No related tags found
Showing
- htdocs/comm/propal/class/propal.class.php 1 addition, 1 deletionhtdocs/comm/propal/class/propal.class.php
- htdocs/commande/class/commande.class.php 1 addition, 1 deletionhtdocs/commande/class/commande.class.php
- htdocs/compta/facture/class/facture.class.php 1 addition, 1 deletionhtdocs/compta/facture/class/facture.class.php
- htdocs/core/lib/tax.lib.php 4 additions, 0 deletionshtdocs/core/lib/tax.lib.php
- htdocs/core/login/functions_ldap.php 9 additions, 0 deletionshtdocs/core/login/functions_ldap.php
- htdocs/fourn/commande/fiche.php 24 additions, 24 deletionshtdocs/fourn/commande/fiche.php
- htdocs/langs/es_ES/admin.lang 0 additions, 1 deletionhtdocs/langs/es_ES/admin.lang
- htdocs/langs/es_ES/main.lang 0 additions, 1 deletionhtdocs/langs/es_ES/main.lang
Loading
Please register or sign in to comment