Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

9b85a700

Commit 9b85a700 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php

parents 5d585fa0 f08d52b0

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 6 additions, 0 deletions

ChangeLog
htdocs/comm/propal.php 2 additions, 2 deletions

htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php 31 additions, 33 deletions

htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/pdf.lib.php 0 additions, 1 deletion

htdocs/core/lib/pdf.lib.php
htdocs/product/index.php 1 addition, 1 deletion

htdocs/product/index.php
htdocs/product/stock/class/entrepot.class.php 6 additions, 6 deletions

htdocs/product/stock/class/entrepot.class.php

with 46 additions and 43 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