Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

6b6b3725

Commit 6b6b3725 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/theme/eldy/graph-color.php

parents a8668aee d4a0c122

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 1 addition, 0 deletions

ChangeLog
htdocs/adherents/fiche.php 1 addition, 0 deletions

htdocs/adherents/fiche.php
htdocs/admin/tools/update.php 1 addition, 1 deletion

htdocs/admin/tools/update.php
htdocs/contrat/class/contrat.class.php 1 addition, 0 deletions

htdocs/contrat/class/contrat.class.php
htdocs/product/class/product.class.php 1 addition, 0 deletions

htdocs/product/class/product.class.php
htdocs/projet/class/task.class.php 1 addition, 0 deletions

htdocs/projet/class/task.class.php
htdocs/theme/eldy/graph-color.php 1 addition, 1 deletion

htdocs/theme/eldy/graph-color.php

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