Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

ab771587

Commit ab771587 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/expedition/fiche.php

parents e49a46a3 b8c512a3

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 5 additions, 0 deletions

ChangeLog
htdocs/admin/dict.php 2 additions, 2 deletions

htdocs/admin/dict.php
htdocs/compta/bank/virement.php 2 additions, 1 deletion

htdocs/compta/bank/virement.php
htdocs/compta/deplacement/fiche.php 20 additions, 11 deletions

htdocs/compta/deplacement/fiche.php
htdocs/expedition/class/expedition.class.php 0 additions, 2 deletions

htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php 8 additions, 1 deletion

htdocs/expedition/fiche.php
htdocs/projet/element.php 8 additions, 1 deletion

htdocs/projet/element.php

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