Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

1f986014

Commit 1f986014 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents 9aab62ab bd839116

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/margin/agentMargins.php 2 additions, 2 deletions

htdocs/margin/agentMargins.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
htdocs/webservices/server_contact.php 1 addition, 0 deletions

htdocs/webservices/server_contact.php

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