Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

480a398f

Commit 480a398f authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.8' into develop

Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php

parents cb8227f0 e6806611

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/class/html.form.class.php 3 additions, 2 deletions

htdocs/core/class/html.form.class.php
htdocs/core/class/html.formprojet.class.php 1 addition, 1 deletion

htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/init_menu_auguria.sql 6 additions, 4 deletions

htdocs/core/menus/init_menu_auguria.sql
htdocs/holiday/card.php 22 additions, 17 deletions

htdocs/holiday/card.php
htdocs/holiday/list.php 1 addition, 1 deletion

htdocs/holiday/list.php
htdocs/resource/class/resource.class.php 7 additions, 2 deletions

htdocs/resource/class/resource.class.php
htdocs/resource/list.php 9 additions, 13 deletions

htdocs/resource/list.php

with 49 additions and 40 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