Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e7072185

Commit e7072185 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/comm/propal.php

parents 7cca4f3e 49c25494

Branches

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

htdocs/comm/propal/card.php 0 additions, 34 deletions

htdocs/comm/propal/card.php
htdocs/expensereport/class/expensereport.class.php 3 additions, 0 deletions

htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/commande/dispatch.php 1 addition, 0 deletions

htdocs/fourn/commande/dispatch.php
htdocs/holiday/class/holiday.class.php 6 additions, 3 deletions

htdocs/holiday/class/holiday.class.php
htdocs/product/document.php 2 additions, 1 deletion

htdocs/product/document.php
htdocs/user/group/card.php 1 addition, 0 deletions

htdocs/user/group/card.php

with 13 additions and 38 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