Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

Admin message

On Saturday, April 12 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.

db1d9d6d

Commit db1d9d6d authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/fourn/commande/dispatch.php

parents 36632593 0c3ebe63

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/modules/modFacture.class.php 2 additions, 2 deletions

htdocs/core/modules/modFacture.class.php
htdocs/fourn/commande/dispatch.php 11 additions, 3 deletions

htdocs/fourn/commande/dispatch.php
htdocs/product/class/product.class.php 1 addition, 1 deletion

htdocs/product/class/product.class.php
htdocs/product/stock/class/entrepot.class.php 1 addition, 1 deletion

htdocs/product/stock/class/entrepot.class.php

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