Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

40b41272

You need to sign in or sign up before continuing.

Commit 40b41272 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents d9368983 43a6366f

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

htdocs/core/tpl/objectline_edit.tpl.php 2 additions, 2 deletions

htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/triggers/interface_20_all_Logevents.class.php 3 additions, 0 deletions

htdocs/core/triggers/interface_20_all_Logevents.class.php
htdocs/user/card.php 138 additions, 141 deletions

htdocs/user/card.php
htdocs/user/class/user.class.php 35 additions, 15 deletions

htdocs/user/class/user.class.php
htdocs/user/class/usergroup.class.php 37 additions, 17 deletions

htdocs/user/class/usergroup.class.php
htdocs/user/group/card.php 13 additions, 13 deletions

htdocs/user/group/card.php

with 228 additions and 188 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