Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

f9ef6f52

Commit f9ef6f52 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	dev/skeletons/skeleton_list.php

parents 03f13e99 b6463c52

Branches

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

dev/skeletons/skeleton_list.php 2 additions, 1 deletion

dev/skeletons/skeleton_list.php
htdocs/contrat/class/contrat.class.php 10 additions, 0 deletions

htdocs/contrat/class/contrat.class.php
htdocs/core/extrafieldsinexport.inc.php 1 addition, 1 deletion

htdocs/core/extrafieldsinexport.inc.php
htdocs/fichinter/class/fichinter.class.php 1 addition, 1 deletion

htdocs/fichinter/class/fichinter.class.php

with 14 additions and 3 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