Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

8755fa07

Commit 8755fa07 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/main.inc.php

parents e7a09c07 b91b8c64

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

htdocs/contrat/card.php 2 additions, 2 deletions

htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php 2 additions, 0 deletions

htdocs/contrat/class/contrat.class.php
htdocs/core/actions_extrafields.inc.php 1 addition, 0 deletions

htdocs/core/actions_extrafields.inc.php
htdocs/core/tpl/admin_extrafields_add.tpl.php 33 additions, 30 deletions

htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php 20 additions, 17 deletions

htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/ecm/index.php 7 additions, 1 deletion

htdocs/ecm/index.php
htdocs/main.inc.php 2 additions, 4 deletions

htdocs/main.inc.php
htdocs/projet/tasks/list.php 2 additions, 2 deletions

htdocs/projet/tasks/list.php
htdocs/theme/eldy/style.css.php 1 addition, 1 deletion

htdocs/theme/eldy/style.css.php

with 70 additions and 57 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