Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/fourn/facture/card.php htdocs/theme/eldy/style.css.php
No related branches found
No related tags found
Showing
- htdocs/comm/propal.php 2 additions, 2 deletionshtdocs/comm/propal.php
- htdocs/commande/card.php 2 additions, 3 deletionshtdocs/commande/card.php
- htdocs/compta/facture.php 3 additions, 3 deletionshtdocs/compta/facture.php
- htdocs/core/lib/functions.lib.php 6 additions, 4 deletionshtdocs/core/lib/functions.lib.php
- htdocs/core/tpl/document_actions_post_headers.tpl.php 1 addition, 1 deletionhtdocs/core/tpl/document_actions_post_headers.tpl.php
- htdocs/expedition/card.php 2 additions, 2 deletionshtdocs/expedition/card.php
- htdocs/fichinter/card.php 2 additions, 2 deletionshtdocs/fichinter/card.php
- htdocs/fourn/commande/card.php 2 additions, 2 deletionshtdocs/fourn/commande/card.php
- htdocs/fourn/facture/card.php 2 additions, 2 deletionshtdocs/fourn/facture/card.php
- htdocs/install/mysql/migration/3.6.0-3.7.0.sql 4 additions, 0 deletionshtdocs/install/mysql/migration/3.6.0-3.7.0.sql
- htdocs/public/demo/index.php 1 addition, 1 deletionhtdocs/public/demo/index.php
- htdocs/public/members/public_card.php 8 additions, 4 deletionshtdocs/public/members/public_card.php
- htdocs/public/members/public_list.php 20 additions, 15 deletionshtdocs/public/members/public_list.php
- htdocs/theme/eldy/style.css.php 14 additions, 0 deletionshtdocs/theme/eldy/style.css.php
Loading
Please register or sign in to comment