Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

7b14b5e1

Commit 7b14b5e1 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/menus/standard/eldy.lib.php

parents 23e90974 ef7061a5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

htdocs/core/modules/modProjet.class.php
htdocs/expedition/list.php 4 additions, 2 deletions

htdocs/expedition/list.php
htdocs/index.php 6 additions, 6 deletions

htdocs/index.php
htdocs/langs/en_US/categories.lang 1 addition, 0 deletions

htdocs/langs/en_US/categories.lang
htdocs/product/stock/list.php 17 additions, 7 deletions

htdocs/product/stock/list.php
htdocs/societe/index.php 6 additions, 6 deletions

htdocs/societe/index.php

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