Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

a1e778c1

Commit a1e778c1 authored 11 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents 1061a650 4bd6f111

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/class/conf.class.php 5 additions, 0 deletions

htdocs/core/class/conf.class.php
htdocs/core/modules/import/import_csv.modules.php 12 additions, 11 deletions

htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/modSociete.class.php 5 additions, 5 deletions

htdocs/core/modules/modSociete.class.php
test/phpunit/Example_import_company_1.csv 2 additions, 1 deletion

test/phpunit/Example_import_company_1.csv
test/phpunit/FilesLibTest.php 1 addition, 1 deletion

test/phpunit/FilesLibTest.php
test/phpunit/ImportTest.php 4 additions, 1 deletion

test/phpunit/ImportTest.php

with 29 additions and 19 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