Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
This commit is contained in:
Laurent Destailleur
2012-07-25 12:20:45 +02:00
parent ea54523181 e12604cb71
commit dce9b96260
84 changed files with 2932 additions and 3005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/lib/repair.lib.php
View File

@@ -141,7 +141,7 @@ function clean_data_ecm_directories()
}
else dol_print_error($db,'Failed to run request');
return;
return;
}
?>