Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

868f2e54

Commit 868f2e54 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/admin/tools/update.php
	htdocs/core/lib/functions.lib.php

parents cda301f6 ae740b7c

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

htdocs/admin/modules.php 8 additions, 2 deletions

htdocs/admin/modules.php
htdocs/core/lib/functions.lib.php 20 additions, 16 deletions

htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/errors.lang 2 additions, 0 deletions

htdocs/langs/en_US/errors.lang
htdocs/user/class/user.class.php 1 addition, 1 deletion

htdocs/user/class/user.class.php

with 31 additions and 19 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