Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php
No related branches found
No related tags found
Showing
- htdocs/compta/facture/card.php 7 additions, 8 deletionshtdocs/compta/facture/card.php
- htdocs/core/datepicker.php 3 additions, 0 deletionshtdocs/core/datepicker.php
- htdocs/core/get_menudiv.php 6 additions, 4 deletionshtdocs/core/get_menudiv.php
- htdocs/core/lib/functions.lib.php 4 additions, 1 deletionhtdocs/core/lib/functions.lib.php
- htdocs/core/menus/standard/auguria.lib.php 18 additions, 16 deletionshtdocs/core/menus/standard/auguria.lib.php
- htdocs/core/menus/standard/eldy.lib.php 6 additions, 4 deletionshtdocs/core/menus/standard/eldy.lib.php
- htdocs/core/menus/standard/empty.php 12 additions, 8 deletionshtdocs/core/menus/standard/empty.php
- htdocs/core/search_page.php 6 additions, 3 deletionshtdocs/core/search_page.php
- htdocs/fourn/commande/card.php 15 additions, 5 deletionshtdocs/fourn/commande/card.php
- htdocs/install/inc.php 3 additions, 3 deletionshtdocs/install/inc.php
- htdocs/product/list.php 2 additions, 2 deletionshtdocs/product/list.php
- htdocs/product/price.php 5 additions, 1 deletionhtdocs/product/price.php
- htdocs/supplier_proposal/card.php 0 additions, 5 deletionshtdocs/supplier_proposal/card.php
- htdocs/support/inc.php 1 addition, 1 deletionhtdocs/support/inc.php
- htdocs/theme/eldy/style.css.php 2 additions, 0 deletionshtdocs/theme/eldy/style.css.php
- htdocs/theme/md/style.css.php 15 additions, 0 deletionshtdocs/theme/md/style.css.php
- htdocs/user/card.php 1 addition, 1 deletionhtdocs/user/card.php
Loading
Please register or sign in to comment