Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

8b793a26

Commit 8b793a26 authored 7 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/modules/DolibarrModules.class.php

parents 91d274b5 d81fcd5f

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/class/commonobject.class.php 7 additions, 7 deletions

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

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