Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	ChangeLog
	htdocs/admin/dict.php
	htdocs/comm/prospect/fiche.php
This commit is contained in:
Laurent Destailleur
2013-04-17 23:15:57 +02:00
parent e505ce3e7d 21a1441a80
commit ff2adc40a4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/phpunit/NumberingModulesTest.php
View File

@@ -443,4 +443,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
}
}
?>
?>