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

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

Browse Source 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
This commit is contained in:
Laurent Destailleur
2014-05-06 23:58:17 +02:00
parent e214cdf231 fe43d10c79
commit 9f795331f5
40 changed files with 199 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/phpunit/ScriptsTest.php
View File

@@ -254,4 +254,4 @@ class ScriptsTest extends PHPUnit_Framework_TestCase
return $result;
}
}
?>
?>