Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

d3960b08

Commit d3960b08 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.9' into develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php

parents 277d92af 7def330f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/adherents/card_subscriptions.php 2 additions, 2 deletions

htdocs/adherents/card_subscriptions.php
htdocs/comm/propal/class/propal.class.php 2 additions, 3 deletions

htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php 0 additions, 1 deletion

htdocs/commande/card.php
htdocs/commande/class/commande.class.php 2 additions, 1 deletion

htdocs/commande/class/commande.class.php
htdocs/core/lib/member.lib.php 2 additions, 2 deletions

htdocs/core/lib/member.lib.php
htdocs/expedition/card.php 9 additions, 5 deletions

htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php 1 addition, 0 deletions

htdocs/expedition/class/expedition.class.php
htdocs/langs/en_US/errors.lang 1 addition, 0 deletions

htdocs/langs/en_US/errors.lang
htdocs/product/stock/product.php 2 additions, 4 deletions

htdocs/product/stock/product.php

with 21 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment