Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

c13d2d20

Commit c13d2d20 authored 9 years ago by Juanjo Menent

Downloads
- Plain Diff

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

Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php

parents 1f44bb59 355fcc78

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 14 additions, 14 deletions

ChangeLog
htdocs/compta/facture/class/facture.class.php 7 additions, 6 deletions

htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php 1 addition, 2 deletions

htdocs/compta/paiement/cheque/class/remisecheque.class.php

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