Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

Admin message

On Saturday, June 28 from 8:00 AM to 9:00 AM, we will be performing an upgrade of the GitLab system. During that time, GitLab and git services on git.unl.edu may be unavailable.

ee8112dd

Commit ee8112dd authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

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

parents e6637422 61031f16

Branches

Tags

No related merge requests found

Changes 7

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/product/admin/price_rules.php 2 additions, 2 deletions

htdocs/product/admin/price_rules.php
htdocs/product/class/product.class.php 2 additions, 2 deletions

htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php 12 additions, 8 deletions

htdocs/projet/class/project.class.php
htdocs/projet/element.php 5 additions, 4 deletions

htdocs/projet/element.php

with 27 additions and 20 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