Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

2f19fd96

Commit 2f19fd96 authored 12 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents acad2191 97027c7d

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

htdocs/core/ajax/ajaxdirpreview.php 5 additions, 5 deletions

htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/boxes/box_produits.php 5 additions, 4 deletions

htdocs/core/boxes/box_produits.php
htdocs/core/class/html.formfile.class.php 10 additions, 9 deletions

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

htdocs/core/lib/files.lib.php
htdocs/ecm/class/ecmdirectory.class.php 6 additions, 6 deletions

htdocs/ecm/class/ecmdirectory.class.php
htdocs/ecm/docdir.php 29 additions, 36 deletions

htdocs/ecm/docdir.php
htdocs/ecm/docmine.php 19 additions, 20 deletions

htdocs/ecm/docmine.php

with 75 additions and 81 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