Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

cd5e4348

Commit cd5e4348 authored 7 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php

parents 5313d618 02f47b5a

Branches

Tags

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

htdocs/comm/action/class/actioncomm.class.php 5 additions, 3 deletions

htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php 2 additions, 3 deletions

htdocs/contrat/card.php
htdocs/core/lib/project.lib.php 1 addition, 0 deletions

htdocs/core/lib/project.lib.php
htdocs/expedition/card.php 1 addition, 0 deletions

htdocs/expedition/card.php
htdocs/societe/consumption.php 2 additions, 2 deletions

htdocs/societe/consumption.php

with 11 additions and 8 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