Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

83e873dd

Commit 83e873dd authored 11 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents 88fe3e86 f8ddd69c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/dict.php 3 additions, 2 deletions

htdocs/admin/dict.php
htdocs/comm/action/document.php 158 additions, 157 deletions

htdocs/comm/action/document.php
htdocs/compta/sociales/class/chargesociales.class.php 1 addition, 1 deletion

htdocs/compta/sociales/class/chargesociales.class.php
htdocs/compta/sociales/document.php 2 additions, 2 deletions

htdocs/compta/sociales/document.php
htdocs/core/class/fileupload.class.php 34 additions, 1 deletion

htdocs/core/class/fileupload.class.php
htdocs/projet/class/task.class.php 1 addition, 0 deletions

htdocs/projet/class/task.class.php
htdocs/projet/tasks/document.php 6 additions, 2 deletions

htdocs/projet/tasks/document.php

with 205 additions and 165 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