Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

5d34f787

Commit 5d34f787 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/class/conf.class.php

parents 19ac1606 cda681ac

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

htdocs/comm/askpricesupplier/card.php 1 addition, 1 deletion

htdocs/comm/askpricesupplier/card.php
htdocs/comm/mailing/list.php 10 additions, 11 deletions

htdocs/comm/mailing/list.php
htdocs/expedition/class/expedition.class.php 13 additions, 4 deletions

htdocs/expedition/class/expedition.class.php
htdocs/livraison/card.php 6 additions, 2 deletions

htdocs/livraison/card.php

with 30 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