Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

001f1b4c

Commit 001f1b4c authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/filefunc.inc.php

parents 2faa5d72 897686a7

Branches

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

build/makepack-dolibarr.pl 1 addition, 1 deletion

build/makepack-dolibarr.pl
htdocs/compta/index.php 6 additions, 5 deletions

htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php 0 additions, 1 deletion

htdocs/core/boxes/box_prospect.php
htdocs/margin/customerMargins.php 2 additions, 2 deletions

htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php 2 additions, 2 deletions

htdocs/margin/productMargins.php

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