Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

7bfbc4cb

Commit 7bfbc4cb authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php

parents 51baae16 4bf86508

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 1 addition, 1 deletion

ChangeLog
htdocs/core/lib/doc.lib.php 4 additions, 7 deletions

htdocs/core/lib/doc.lib.php
htdocs/core/lib/functions.lib.php 8 additions, 16 deletions

htdocs/core/lib/functions.lib.php
htdocs/includes/odtphp/Segment.php 7 additions, 1 deletion

htdocs/includes/odtphp/Segment.php
htdocs/includes/odtphp/odf.php 63 additions, 7 deletions

htdocs/includes/odtphp/odf.php
htdocs/livraison/fiche.php 8 additions, 8 deletions

htdocs/livraison/fiche.php
htdocs/projet/class/project.class.php 6 additions, 3 deletions

htdocs/projet/class/project.class.php
test/phpunit/FunctionsLibTest.php 64 additions, 2 deletions

test/phpunit/FunctionsLibTest.php

with 161 additions and 45 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