Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e7e51d9e

Commit e7e51d9e authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/projet/class/project.class.php

parents 43e70830 9e545e96

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

htdocs/contrat/class/contrat.class.php 1 addition, 1 deletion

htdocs/contrat/class/contrat.class.php
htdocs/core/boxes/box_factures_imp.php 2 additions, 1 deletion

htdocs/core/boxes/box_factures_imp.php
htdocs/main.inc.php 3 additions, 2 deletions

htdocs/main.inc.php
htdocs/projet/class/project.class.php 14 additions, 10 deletions

htdocs/projet/class/project.class.php
htdocs/projet/element.php 3 additions, 1 deletion

htdocs/projet/element.php

with 23 additions and 15 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