Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

5713d293

Commit 5713d293 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php

parents 05384b2f 62521358

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

htdocs/comm/action/card.php
htdocs/core/lib/pdf.lib.php 10 additions, 4 deletions

htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php 7 additions, 4 deletions

htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/expedition/class/expedition.class.php 3 additions, 1 deletion

htdocs/expedition/class/expedition.class.php
htdocs/langs/en_US/admin.lang 3 additions, 1 deletion

htdocs/langs/en_US/admin.lang

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