Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

2c01a467

Commit 2c01a467 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php

parents ae3c83b7 f5da9b5e

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 0 deletions

ChangeLog
htdocs/core/boxes/box_activity.php 1 addition, 1 deletion

htdocs/core/boxes/box_activity.php
htdocs/core/class/commonobject.class.php 2 additions, 2 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php 1 addition, 0 deletions

htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formother.class.php 1 addition, 0 deletions

htdocs/core/class/html.formother.class.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php 25 additions, 0 deletions

htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/margin/agentMargins.php 1 addition, 0 deletions

htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php 1 addition, 0 deletions

htdocs/margin/customerMargins.php
htdocs/projet/class/task.class.php 2 additions, 1 deletion

htdocs/projet/class/task.class.php

with 36 additions and 4 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