Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e57f8344

Commit e57f8344 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/filefunc.inc.php

parents 4907f958 71e368aa

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/extrafields.class.php 28 additions, 4 deletions

htdocs/core/class/extrafields.class.php
htdocs/expensereport/class/expensereport.class.php 3 additions, 4 deletions

htdocs/expensereport/class/expensereport.class.php
htdocs/filefunc.inc.php 1 addition, 1 deletion

htdocs/filefunc.inc.php

with 32 additions and 9 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