Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e1fec958

Commit e1fec958 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

develop

Conflicts:
	htdocs/user/group/fiche.php

parents d1136bee b73fe26d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/lib/usergroups.lib.php 5 additions, 0 deletions

htdocs/core/lib/usergroups.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql 7 additions, 0 deletions

htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql 20 additions, 0 deletions

...cs/install/mysql/tables/llx_usergroup_extrafields.key.sql
htdocs/install/mysql/tables/llx_usergroup_extrafields.sql 26 additions, 0 deletions

htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
htdocs/user/admin/group_extrafields.php 155 additions, 0 deletions

htdocs/user/admin/group_extrafields.php
htdocs/user/class/usergroup.class.php 64 additions, 6 deletions

htdocs/user/class/usergroup.class.php
htdocs/user/group/card.php 38 additions, 1 deletion

htdocs/user/group/card.php

with 315 additions and 7 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