Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

c386a028

Commit c386a028 authored 7 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/langs/en_US/stocks.lang

parents 6902960d 8b793a26

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/class/commonobject.class.php 1 addition, 1 deletion

htdocs/core/class/commonobject.class.php
htdocs/core/modules/DolibarrModules.class.php 49 additions, 49 deletions

htdocs/core/modules/DolibarrModules.class.php
htdocs/install/mysql/migration/3.8.0-3.9.0.sql 4 additions, 0 deletions

htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/langs/en_US/stocks.lang 2 additions, 1 deletion

htdocs/langs/en_US/stocks.lang

with 56 additions and 51 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