Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

10f63950

Commit 10f63950 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/lib/files.lib.php

parents c12541f4 066c793d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/class/html.formfile.class.php 7 additions, 3 deletions

htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php 3 additions, 1 deletion

htdocs/core/lib/files.lib.php
htdocs/core/lib/images.lib.php 2 additions, 1 deletion

htdocs/core/lib/images.lib.php
htdocs/core/modules/modStock.class.php 2 additions, 2 deletions

htdocs/core/modules/modStock.class.php

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