Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

4969af8c

Commit 4969af8c authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	ChangeLog
	htdocs/product/card.php

parents 859a9cad 08f27a5c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 6 additions, 6 deletions

ChangeLog
htdocs/core/class/commondocgenerator.class.php 2 additions, 2 deletions

htdocs/core/class/commondocgenerator.class.php
htdocs/product/card.php 1 addition, 1 deletion

htdocs/product/card.php
htdocs/supplier_proposal/card.php 1 addition, 1 deletion

htdocs/supplier_proposal/card.php

with 10 additions and 10 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