-
- Downloads
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/core/modules/modProduct.class.php
No related branches found
No related tags found
Showing
- htdocs/comm/mailing/card.php 38 additions, 5 deletionshtdocs/comm/mailing/card.php
- htdocs/comm/mailing/cibles.php 1 addition, 1 deletionhtdocs/comm/mailing/cibles.php
- htdocs/comm/mailing/class/mailing.class.php 20 additions, 17 deletionshtdocs/comm/mailing/class/mailing.class.php
- htdocs/comm/mailing/list.php 3 additions, 2 deletionshtdocs/comm/mailing/list.php
- htdocs/compta/facture.php 2 additions, 2 deletionshtdocs/compta/facture.php
- htdocs/compta/facture/class/facture.class.php 27 additions, 10 deletionshtdocs/compta/facture/class/facture.class.php
- htdocs/contact/agenda.php 1 addition, 1 deletionhtdocs/contact/agenda.php
- htdocs/contact/card.php 6 additions, 27 deletionshtdocs/contact/card.php
- htdocs/core/class/commonobject.class.php 1 addition, 0 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/class/discount.class.php 4 additions, 4 deletionshtdocs/core/class/discount.class.php
- htdocs/core/class/html.formmargin.class.php 27 additions, 22 deletionshtdocs/core/class/html.formmargin.class.php
- htdocs/core/class/html.formprojet.class.php 3 additions, 2 deletionshtdocs/core/class/html.formprojet.class.php
- htdocs/core/lib/security.lib.php 3 additions, 2 deletionshtdocs/core/lib/security.lib.php
- htdocs/core/modules/mailings/advthirdparties.modules.php 1 addition, 0 deletionshtdocs/core/modules/mailings/advthirdparties.modules.php
- htdocs/core/modules/mailings/contacts1.modules.php 3 additions, 3 deletionshtdocs/core/modules/mailings/contacts1.modules.php
- htdocs/core/modules/mailings/contacts2.modules.php 1 addition, 1 deletionhtdocs/core/modules/mailings/contacts2.modules.php
- htdocs/core/modules/mailings/contacts3.modules.php 2 additions, 2 deletionshtdocs/core/modules/mailings/contacts3.modules.php
- htdocs/core/modules/mailings/contacts4.modules.php 2 additions, 2 deletionshtdocs/core/modules/mailings/contacts4.modules.php
- htdocs/core/modules/mailings/example.modules.php 3 additions, 1 deletionhtdocs/core/modules/mailings/example.modules.php
- htdocs/core/modules/mailings/fraise.modules.php 2 additions, 4 deletionshtdocs/core/modules/mailings/fraise.modules.php
Loading
Please register or sign in to comment