Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e5513cff

Commit e5513cff authored 7 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

Conflicts:
	htdocs/accountancy/journal/bankjournal.php

parents 3cd21ee6 4e45c7fd

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/modules/facture/doc/pdf_crabe.modules.php 19 additions, 0 deletions

htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/supplier_proposal/card.php 3 additions, 2 deletions

htdocs/supplier_proposal/card.php
htdocs/supplier_proposal/class/supplier_proposal.class.php 2 additions, 0 deletions

htdocs/supplier_proposal/class/supplier_proposal.class.php
scripts/product/migrate_picture_path.php 1 addition, 1 deletion

scripts/product/migrate_picture_path.php

with 25 additions and 3 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