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

develop

Conflicts:
	htdocs/install/filelist.xml
This commit is contained in:
Laurent Destailleur 2015-07-12 23:49:30 +02:00
commit e8a0f9da73

View File

@ -11089,7 +11089,7 @@
<md5file name="cidlookup.php">adf4d0f538de7decd6b3e4c5140c159a</md5file>
</dir>
<dir name="" >
<md5file name="filefunc.inc.php">9f1dec68ba7234ffe710993fd505e182</md5file>
<md5file name="filefunc.inc.php">f5f367fb300805531da4489c7d3a6505</md5file>
</dir>
<dir name="/fichinter" >
<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>