Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop Conflicts: htdocs/install/mysql/tables/llx_user.sql
Showing
- htdocs/commande/card.php 18 additions, 18 deletionshtdocs/commande/card.php
- htdocs/commande/class/api_deprecated_commande.class.php 76 additions, 76 deletionshtdocs/commande/class/api_deprecated_commande.class.php
- htdocs/commande/class/api_orders.class.php 62 additions, 62 deletionshtdocs/commande/class/api_orders.class.php
- htdocs/commande/class/commande.class.php 30 additions, 22 deletionshtdocs/commande/class/commande.class.php
- htdocs/core/modules/modSalaries.class.php 15 additions, 7 deletionshtdocs/core/modules/modSalaries.class.php
- htdocs/install/mysql/migration/4.0.0-5.0.0.sql 1 addition, 0 deletionshtdocs/install/mysql/migration/4.0.0-5.0.0.sql
- htdocs/install/mysql/tables/llx_user.sql 2 additions, 0 deletionshtdocs/install/mysql/tables/llx_user.sql
- htdocs/langs/en_US/admin.lang 2 additions, 2 deletionshtdocs/langs/en_US/admin.lang
- htdocs/langs/en_US/users.lang 2 additions, 1 deletionhtdocs/langs/en_US/users.lang
- htdocs/langs/fr_FR/users.lang 1 addition, 0 deletionshtdocs/langs/fr_FR/users.lang
- htdocs/user/card.php 25 additions, 0 deletionshtdocs/user/card.php
- htdocs/user/class/user.class.php 7 additions, 1 deletionhtdocs/user/class/user.class.php
Loading
Please register or sign in to comment